Merge pull request #124 from roman01la/master

JSX icons
file-icons · Mar 7, 2015 · d24ec17 · d24ec17
2 parents 3c5e9c2 + 770889c
commit d24ec17
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/examples/jsx.jsx b/examples/jsx.jsx
diff --git a/resources/fonts/file-icons.woff b/resources/fonts/file-icons.woff
diff --git a/stylesheets/file-icons.less b/stylesheets/file-icons.less
@@ -161,10 +161,13 @@
 
   // JavaScript icon
   &[data-name$=".js"]:before  { .js-icon; .medium-yellow; }
-  &[data-name$=".jsx"]:before { .js-icon; .medium-green; }
   &[data-name$=".ts"]:before  { .js-icon; .medium-purple; }
   &[data-name$=".es6"]:before  { .js-icon; .medium-yellow; }
 
+  // JSX icon
+  &[data-name$=".jsx"]:before { .react-icon; .medium-blue; }
+  /* &[data-name$=".jsx"]:before { .jsx-icon; .medium-blue; } */
+
   // Coffee icon
   &[data-name$=".coffee"]:before    { .coffee-icon; .medium-maroon; }
   &[data-name$=".cjsx"]:before      { .coffee-icon; .dark-maroon; }

diff --git a/stylesheets/fonts.less b/stylesheets/fonts.less
@@ -39,3 +39,10 @@
   font-weight: normal;
   font-style: normal;
 }
+
+@font-face {
+  font-family: "file-icons";
+  src: url(atom://file-icons/resources/fonts/file-icons.woff) format("woff");
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/stylesheets/icons.less b/stylesheets/icons.less
@@ -129,3 +129,10 @@
 .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" }
+.react-icon { .file-icons; content: "\f100" }