Merge branch '3.2.0-wip' of https://github.com/FortAwesome/Font-Awesome into 3.2.0-wip

scss/_core.scss

@@ -17,7 +17,7 @@
 /* makes the font 33% larger relative to the icon container */
 .icon-large:before {
   vertical-align: -10%;
-  font-size: 4/3em;
+  font-size: (4em/3);
 }
 
 /* makes sure icons active on rollover in links */
@@ -33,11 +33,11 @@ a {
 [class*=" icon-"] {
   &.icon-fixed-width {
     display: inline-block;
-    width: 16/14em;
+    width: (16em/14);
     text-align: right;
-    padding-right: 4/14em;
+    padding-right: (4em/14);
     &.icon-large {
-      width: 20/14em;
+      width: (20em/14);
     }
   }
 }

scss/_mixins.scss

@@ -42,7 +42,7 @@
     }
     .icon-stack-base {
       font-size: $base-font-size;
-      *line-height: $height / $base-font-size;
+      *line-height: #{$height / $base-font-size}em;
     }
   }
 }

scss/_path.scss

@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('${FontAwesomePath}/fontawesome-webfont.eot?v=${FontAwesomeVersion}');
-  src: url('${FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=${FontAwesomeVersion}') format('embedded-opentype'),
-    url('${FontAwesomePath}/fontawesome-webfont.woff?v=${FontAwesomeVersion}') format('woff'),
-    url('${FontAwesomePath}/fontawesome-webfont.ttf?v=${FontAwesomeVersion}') format('truetype'),
-    url('${FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=${FontAwesomeVersion}') format('svg');
-//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?v=#{$FontAwesomeVersion}');
+  src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=#{$FontAwesomeVersion}') format('embedded-opentype'),
+    url('#{$FontAwesomePath}/fontawesome-webfont.woff?v=#{$FontAwesomeVersion}') format('woff'),
+    url('#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}') format('truetype'),
+    url('#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}') format('svg');
+//  src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }

scss/_variables.scss

@@ -1,12 +1,12 @@
 // Variables
 
 $FontAwesomePath: "../font" !default;
-$FontAwesomeVersion: "3.1.0" !default;
+$FontAwesomeVersion: "3.2.0" !default;
 $borderColor: #eeeeee !default;
 $iconMuted: #eeeeee !default;
 $iconLight: white !default;
 $iconDark: #333333 !default;
-$icons-li-width: 30em/14;
+$icons-li-width: (30em/14);
 
 
 $glass: "\f000";

scss/font-awesome-ie7.scss

@@ -25,7 +25,7 @@
  */
 
 .icon-large {
-  font-size: 4/3em;
+  font-size: (4em/3);
   margin-top: -4px;
   padding-top: 3px;
   margin-bottom: -4px;