ie7 more fully supported, large refactor of styles

fwaechter · May 21, 2012 · ff5ff65 · ff5ff65
1 parent 6ae9804
commit ff5ff65
Show file tree

Hide file tree

Showing 15 changed files with 1,436 additions and 1,305 deletions.
diff --git a/docs/assets/css/font-awesome-ie7.css b/docs/assets/css/font-awesome-ie7.css
diff --git a/docs/assets/css/site.css b/docs/assets/css/site.css
diff --git a/docs/assets/font/fontawesome-webfont.eot b/docs/assets/font/fontawesome-webfont.eot
diff --git a/docs/assets/font/fontawesome-webfont.svg b/docs/assets/font/fontawesome-webfont.svg
diff --git a/docs/assets/font/fontawesome-webfont.ttf b/docs/assets/font/fontawesome-webfont.ttf
diff --git a/docs/assets/font/fontawesome-webfont.woff b/docs/assets/font/fontawesome-webfont.woff
diff --git a/docs/assets/font/proximanova-webfont.eot b/docs/assets/font/proximanova-webfont.eot
diff --git a/docs/assets/font/proximanova-webfont.ttf b/docs/assets/font/proximanova-webfont.ttf
diff --git a/docs/assets/js/index/index.js b/docs/assets/js/index/index.js
@@ -5,14 +5,14 @@ $(function() {
         modalTemplate: _.template($("#modal-template").html()),
 
         events:{
-            "click ul.the-icons > li": "iconClicked"
+            "click ul.ficons > li": "iconClicked"
         },
 
         iconClicked: function(event) {
             event.preventDefault();
 
             var $item = $(event.currentTarget);
-            var $modal = $(this.modalTemplate({"style": $item.attr("class")}));
+            var $modal = $(this.modalTemplate({"style": $item.find("i").attr("class")}));
 
             $modal.modal("show");
             $modal.on('hidden', function () {

diff --git a/docs/assets/less/font-awesome.less b/docs/assets/less/font-awesome.less
diff --git a/docs/assets/less/font-museo.less → docs/assets/less/font-site.less b/docs/assets/less/font-museo.less → docs/assets/less/font-site.less
@@ -1,5 +1,5 @@
 @font-face {
-    font-family: 'MuseoSlab';
+    font-family: 'museo-slab';
     src: url('../font/museo_slab_300-webfont.eot');
     src: url('../font/museo_slab_300-webfont.eot?#iefix') format('embedded-opentype'),
          url('../font/museo_slab_300-webfont.ttf') format('truetype');
@@ -8,10 +8,19 @@
 }
 
 @font-face {
-    font-family: 'MuseoSlab';
+    font-family: 'museo-slab';
     src: url('../font/museo_slab_500-webfont.eot');
     src: url('../font/museo_slab_500-webfont.eot?#iefix') format('embedded-opentype'),
          url('../font/museo_slab_500-webfont.ttf') format('truetype');
     font-weight: bold;
     font-style: normal;
 }
+
+@font-face {
+  font-family: 'proxima-nova';
+  src: url('../font/proximanova-webfont.eot');
+  src: url('../font/proximanova-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../font/proximanova-webfont.ttf') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/docs/assets/less/mixins.less b/docs/assets/less/mixins.less
@@ -35,9 +35,9 @@
   }
 }
 
-.icon-size (@size: 12px, @width-multiplier: .9, @height-multiplier: .8) {
-    i { font-size: @size; }
-    line-height: @size * @height-multiplier;
-    height: @size * @height-multiplier;
-    [class^="icon-"] { height: @size * @height-multiplier; }
+.ficon-size (@size: 12px, @width-multiplier: .9, @height-multiplier: .8) {
+  i { font-size: @size; }
+  line-height: @size;
+  height: @size * @height-multiplier;
+  text-align: center;
 }