From db9dd90c2a44f3470bc379c7b100c7c38faf2224 Mon Sep 17 00:00:00 2001 From: Maxime Fabre Date: Fri, 8 Jun 2012 10:30:30 +0200 Subject: [PATCH] Unify variable names --- sass/font-awesome.sass | 4 ++-- sass/font-awesome.scss | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sass/font-awesome.sass b/sass/font-awesome.sass index 18cf5088a..c356e76e4 100644 --- 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 index ae8af5746..d2b0c65df 100644 --- 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);