FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-27 14:01:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #259 from Anahkiasen/master

Browse Source 
Update SASS files to unify variable names
This commit is contained in:
davegandy 2012-06-13 13:37:45 -07:00
commit c3b59a2ef2
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sass/font-awesome.sass
View File

@ -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
* -------------------------------------------------------

12
sass/font-awesome.scss vendored
View File

@ -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);