Merge pull request FortAwesome#259 from Anahkiasen/master

Update SASS files to unify variable names
rdht · Jun 13, 2012 · c3b59a2 · c3b59a2
2 parents 1926e46 + db9dd90
commit c3b59a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/sass/font-awesome.sass b/sass/font-awesome.sass
@@ -22,9 +22,9 @@
 
 @import compass/css3/font-face
 
-$font_path: "../font/fontawesome-webfont" !default
+$fontAwesomePath: "../font/fontawesome-webfont" !default
 
-+font-face("FontAwesome", font-files("#{$font_path}.woff", woff, "#{$font_path}.ttf", truetype, "#{$font_path}.otf", opentype, "#{$font_path}.svgz#FontAwesomeRegular", svg, "#{$font_path}.svg#FontAwesomeRegular", svg), "#{$font_path}.eot", normal, normal)
++font-face("FontAwesome", font-files("#{$fontAwesomePath}.woff", woff, "#{$fontAwesomePath}.ttf", truetype, "#{$fontAwesomePath}.svg#FontAwesomeRegular", svg), "#{$fontAwesomePath}.eot", normal, normal)
 
 /*  Font Awesome styles
  *  -------------------------------------------------------

diff --git a/sass/font-awesome.scss b/sass/font-awesome.scss
@@ -23,17 +23,15 @@
     */
 
 @import "compass/css3/font-face";
-$font_path: "../font/fontawesome-webfont" !default;
+$fontAwesomePath: "../font/fontawesome-webfont" !default;
 
 @include font-face(
     'FontAwesome',
     font-files(
-        "#{$font_path}.woff", woff,
-        "#{$font_path}.ttf", truetype,
-        "#{$font_path}.otf", opentype,
-        "#{$font_path}.svgz#FontAwesomeRegular", svg,
-        "#{$font_path}.svg#FontAwesomeRegular", svg),
-    '#{$font_path}.eot',
+        "#{$fontAwesomePath}.woff", woff,
+        "#{$fontAwesomePath}.ttf", truetype,
+        "#{$fontAwesomePath}.svg#FontAwesomeRegular", svg),
+    '#{$fontAwesomePath}.eot',
     normal,
     normal);