Merge branch 'variants' of https://github.com/slinto/file-icons

Conflicts: styles/file-icons.less
file-icons · Aug 25, 2015 · 5f4ad22 · 5f4ad22
2 parents ff1d9a6 + 301fba6
commit 5f4ad22
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/examples/html.htm b/examples/html.htm
diff --git a/styles/file-icons.less b/styles/file-icons.less
@@ -103,15 +103,14 @@
   &[data-name$=".gitattributes"]:before { .git-icon; }
   &[data-name$=".gitmodules"]:before { .git-icon; }
 
-  // HTML5 icon
-  &[data-name$=".html"]:before { .html5-icon; .medium-orange; }
-  &[data-name$=".htm"]:before { .html5-icon; .dark-orange; }
+  &[data-name$=".html"]:before  { .html5-icon; .medium-orange; }
+  &[data-name$=".htm"]:before   { .html5-icon; .medium-orange; }
   &[data-name$=".shtml"]:before { .html5-icon; .medium-cyan;  }
-  &[data-name$=".haml"]:before { .haml-icon; .medium-yellow;  }
-  &[data-name$=".jade"]:before { .html5-icon; .medium-green;  }
-  &[data-name$=".jsp"]:before  { .html5-icon; .medium-purple; }
-  &[data-name$=".ctp"]:before  { .html5-icon; .medium-blue;   }
-  &[data-name$=".ejs"]:before  { .html5-icon; .medium-green;  }
+  &[data-name$=".haml"]:before  { .haml-icon; .medium-yellow;  }
+  &[data-name$=".jade"]:before  { .html5-icon; .medium-green;  }
+  &[data-name$=".jsp"]:before   { .html5-icon; .medium-purple; }
+  &[data-name$=".ctp"]:before   { .html5-icon; .medium-blue;   }
+  &[data-name$=".ejs"]:before   { .html5-icon; .medium-green;  }
   &[data-name$=".swig"]:before  { .html5-icon; .medium-green;  }
 
   // Mustache icon
@@ -380,6 +379,9 @@
   &[data-name$=".png"]:before { .image-icon; .medium-orange; }
   &[data-name$=".gif"]:before { .image-icon; .medium-yellow; }
   &[data-name$=".jpg"]:before { .image-icon; .medium-green;  }
+  &[data-name$=".PNG"]:before { .image-icon; .medium-orange; }
+  &[data-name$=".GIF"]:before { .image-icon; .medium-yellow; }
+  &[data-name$=".JPG"]:before { .image-icon; .medium-green;  }
 
   // Windows specific Files
   &[data-name$=".bat"]:before { .windows-icon; .medium-purple;}