From b01ec557c52eac746ce3bf20a0ff6545bffaaf58 Mon Sep 17 00:00:00 2001
From: davegandy <dave@davegandy.com>
Date: Wed, 12 Jun 2013 14:18:07 -0400
Subject: [PATCH] final(?) tweaks to scss

---
 scss/_variables.scss                               |  1 +
 scss/font-awesome-ie7.scss                         |  1 -
 src/assets/font-awesome/scss/_core.scss            |  8 ++++----
 src/assets/font-awesome/scss/_mixins.scss          |  2 +-
 src/assets/font-awesome/scss/_path.scss            | 12 ++++++------
 src/assets/font-awesome/scss/_variables.scss       |  5 +++--
 src/assets/font-awesome/scss/font-awesome-ie7.scss |  3 +--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 1ca9b86e1..f918ec8d9 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1,4 +1,5 @@
 // Variables
+// --------------------------
 
 $FontAwesomePath: "../font" !default;
 $FontAwesomeVersion: "3.2.0" !default;
diff --git a/scss/font-awesome-ie7.scss b/scss/font-awesome-ie7.scss
index b9779a3d7..0d1e55247 100644
--- a/scss/font-awesome-ie7.scss
+++ b/scss/font-awesome-ie7.scss
@@ -78,7 +78,6 @@ a [class*=" icon-"] {
 @mixin ie7icon($inner) { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '#{$inner}'); }
 
 
-
 .icon-glass {
   @include ie7icon('&#xf000;');
 }
diff --git a/src/assets/font-awesome/scss/_core.scss b/src/assets/font-awesome/scss/_core.scss
index 8199965a3..2ae7d5577 100644
--- a/src/assets/font-awesome/scss/_core.scss
+++ b/src/assets/font-awesome/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);
     }
   }
 }
diff --git a/src/assets/font-awesome/scss/_mixins.scss b/src/assets/font-awesome/scss/_mixins.scss
index 4c1a2da3a..ca9c5931b 100644
--- a/src/assets/font-awesome/scss/_mixins.scss
+++ b/src/assets/font-awesome/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;
     }
   }
 }
diff --git a/src/assets/font-awesome/scss/_path.scss b/src/assets/font-awesome/scss/_path.scss
index f943b26ff..bb3f36b70 100644
--- a/src/assets/font-awesome/scss/_path.scss
+++ b/src/assets/font-awesome/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;
 }
diff --git a/src/assets/font-awesome/scss/_variables.scss b/src/assets/font-awesome/scss/_variables.scss
index d3eb6fd04..30bab220a 100644
--- a/src/assets/font-awesome/scss/_variables.scss
+++ b/src/assets/font-awesome/scss/_variables.scss
@@ -1,14 +1,15 @@
 ---
 ---
 // Variables
+// --------------------------
 
 $FontAwesomePath: "../font" !default;
-$FontAwesomeVersion: "3.1.0" !default;
+$FontAwesomeVersion: "{{ site.fontawesome.version }}" !default;
 $borderColor: #eeeeee !default;
 $iconMuted: #eeeeee !default;
 $iconLight: white !default;
 $iconDark: #333333 !default;
-$icons-li-width: 30em/14;
+$icons-li-width: (30em/14);
 
 {% for icon in icons %}
 ${{ icon.id }}: "\{{ icon.unicode }}";
diff --git a/src/assets/font-awesome/scss/font-awesome-ie7.scss b/src/assets/font-awesome/scss/font-awesome-ie7.scss
index ec1bed063..3ba99da60 100644
--- a/src/assets/font-awesome/scss/font-awesome-ie7.scss
+++ b/src/assets/font-awesome/scss/font-awesome-ie7.scss
@@ -3,7 +3,7 @@
 {% include license-code.less %}
 
 .icon-large {
-  font-size: 4/3em;
+  font-size: (4em/3);
   margin-top: -4px;
   padding-top: 3px;
   margin-bottom: -4px;
@@ -55,7 +55,6 @@ a [class*=" icon-"] {
 
 @mixin ie7icon($inner) { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '#{$inner}'); }
 
-
 {% for icon in icons %}
 .icon-{{ icon.id }} {
   @include ie7icon('&#x{{ icon.unicode }};');