Merge branch 'master' into vue-theme

material-extensions · Mar 16, 2019 · 4e88293 · 4e88293
2 parents fd6a171 + 94863f0
commit 4e88293
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Rating](https://vsmarketplacebadge.apphb.com/rating-short/pkief.material-icon-theme.svg)](https://marketplace.visualstudio.com/items?itemName=PKief.material-icon-theme)
 [![Installs](https://vsmarketplacebadge.apphb.com/installs-short/PKief.material-icon-theme.svg)](https://marketplace.visualstudio.com/items?itemName=PKief.material-icon-theme)
 [![Downloads](https://vsmarketplacebadge.apphb.com/downloads-short/PKief.material-icon-theme.svg)](https://marketplace.visualstudio.com/items?itemName=PKief.material-icon-theme)
-[![Build Status](https://travis-ci.org/PKief/vscode-material-icon-theme.svg?branch=master)](https://travis-ci.org/PKief/vscode-material-icon-theme)
+[![Build Status](https://travis-ci.com/PKief/vscode-material-icon-theme.svg?branch=master)](https://travis-ci.com/PKief/vscode-material-icon-theme)
 
 The Material Icon Theme provides lots of icons based on Material Design for Visual Studio Code.
 

diff --git a/icons/folder-pipe-open.svg b/icons/folder-pipe-open.svg
diff --git a/icons/folder-pipe.svg b/icons/folder-pipe.svg
diff --git a/icons/folder-svg-open.svg b/icons/folder-svg-open.svg
diff --git a/icons/folder-svg.svg b/icons/folder-svg.svg
diff --git a/icons/svg.svg b/icons/svg.svg
diff --git a/src/icons/fileIcons.ts b/src/icons/fileIcons.ts
@@ -69,7 +69,6 @@ export const fileIcons: FileIcons = {
                 'jpeg',
                 'jpg',
                 'gif',
-                'svg',
                 'ico',
                 'tif',
                 'tiff',
@@ -775,6 +774,7 @@ export const fileIcons: FileIcons = {
         { name: 'scheme', fileExtensions: ['ss', 'scm'] },
         { name: 'tailwindcss', fileNames: ['tailwind.js', 'tailwind.config.js'] },
         { name: '3d', fileExtensions: ['stl', 'obj'] },
-        { name: 'buildkite', fileNames: ['buildkite.yml', 'buildkite.yaml'] }
+        { name: 'buildkite', fileNames: ['buildkite.yml', 'buildkite.yaml'] },
+        { name: 'svg', fileExtensions: ['svg'] },
     ]
 };
diff --git a/src/icons/folderIcons.ts b/src/icons/folderIcons.ts
@@ -172,6 +172,8 @@ export const folderIcons: FolderTheme[] = [
             { name: 'folder-animation', folderNames: ['animation', 'animations', 'animated'] },
             { name: 'folder-guard', folderNames: ['guard', 'guards'] },
             { name: 'folder-prisma', folderNames: ['prisma'] },
+            { name: 'folder-pipe', folderNames: ['pipe', 'pipes'] },
+            { name: 'folder-svg', folderNames: ['svg', 'svgs'] }, 
             { name: 'folder-vuex-store', folderNames: ['store'], enabledFor: [IconPack.Vuex] },
             { name: 'folder-vue', folderNames: ['components'], enabledFor: [IconPack.Vuex , IconPack.Vue] },
         ]