Merge branch 'meteor-icon' of https://github.com/slinto/file-icons in…

…to slinto-meteor-icon Conflicts: styles/icons.less
file-icons · Aug 25, 2015 · ff1d9a6 · ff1d9a6
2 parents 0c7b489 + 046af73
commit ff1d9a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/examples/.meteor/.gitkeep b/examples/.meteor/.gitkeep
diff --git a/styles/file-icons.less b/styles/file-icons.less
@@ -16,6 +16,9 @@
 // Package icon
 .icon-file-directory[data-name=".bundle"]:before { .package-icon; }
 
+// Meteor icon
+.icon-file-directory[data-name=".meteor"]:before { .meteor-icon; }
+
 // Default icon: image
 .icon-file-media[data-name$=".png"]:before { .medium-orange; }
 .icon-file-media[data-name$=".gif"]:before { .medium-yellow; }

diff --git a/styles/icons.less b/styles/icons.less
@@ -86,6 +86,7 @@
 .dlang-icon         { .devicons; content: "\e6af"; }
 .fsharp-icon        { .devicons; content: "\e6a7"; left: 1px; }
 .sass-icon          { .devicons; content: "\e64b"; top: 0; }
+.meteor-icon        { .devicons; content: "\e6a5"; font-size: x-large; left: -2px; }
 
 .composer-icon      {
   .devicons;
@@ -116,11 +117,11 @@
 // .npm-icon           { .devicons; content: "\e616"; }
 // .sass-icon          { .devicons; content: "\e603"; }
 
-.docker { font-family: "fontcustom"; font-size: large; text-align: center; top: 3px; }
+.docker             { font-family: "fontcustom"; font-size: large; text-align: center; top: 3px; }
 .docker-icon        { .docker; content: "\f100"; }
 
-.tex { font-family: "tex"; font-size: 8px; text-align: center;  }
-.tex-icon         { .tex; content: "\e600"; }
+.tex                { font-family: "tex"; font-size: 8px; text-align: center;  }
+.tex-icon           { .tex; content: "\e600"; }
 .bibtex-icon        { .tex; content: "\e601"; top: -1px }
 
 .git-icon           {
@@ -135,16 +136,16 @@
 
 // IconsXD, from http://icomoon.io XD
 
-.icons-xd { font-family: "iconsxd"; font-size: 18px; text-align: center; top: 3px; }
+.icons-xd   { font-family: "iconsxd"; font-size: 18px; text-align: center; top: 3px; }
 
-.ionic-icon         { .icons-xd; content: "\f14b"; }
-.haml-icon         { .icons-xd; content: "\f15b"; font-size: 15px; }
-.node-icon           { .icons-xd; content: "\f17b"; }
-.nginx-icon           { .icons-xd; content: "\f146b"; font-size: 15px; }
+.ionic-icon { .icons-xd; content: "\f14b"; }
+.haml-icon  { .icons-xd; content: "\f15b"; font-size: 15px; }
+.node-icon  { .icons-xd; content: "\f17b"; }
+.nginx-icon { .icons-xd; content: "\f146b"; font-size: 15px; }
 
 // File Icons, custom
 
 .file-icons { font-family: "file-icons"; font-size: large; text-align: center; top: 3px; }
 
-.jsx-icon { .file-icons; content: "\f101" }
+.jsx-icon   { .file-icons; content: "\f101" }
 .react-icon { .file-icons; content: "\f100" }