From b0d91e4a3a667329d05632596313e6cc3bceb569 Mon Sep 17 00:00:00 2001 From: Budi Dharmawan Date: Sat, 5 Jan 2013 20:27:38 +0700 Subject: [PATCH] implementing prefix from AlvinLing https://github.com/AlvinLing/Font-Awesome/commit/b7976b8a108a906383bb6ff8f573022c138ef4ec --- sass/font-awesome.sass | 10 +++++----- sass/font-awesome.scss | 17 ++++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/sass/font-awesome.sass b/sass/font-awesome.sass index 20594c1c8..aa2635ebf 100644 --- a/sass/font-awesome.sass +++ b/sass/font-awesome.sass @@ -19,9 +19,9 @@ * Twitter: http://twitter.com/fortaweso_me * Work: Lead Product Designer @ http://kyruus.com -$fontAwesomePath: "../font" !default -$borderColor: #eee -$iconMuted: #eee +$fontAwesomePath: "../font" !default +$fontAwesomeBorderColor: #eee !default +$fontAwesomeMutedColor: #eee !default @mixin border-radius($radius) -webkit-border-radius: $radius -moz-border-radius: $radius @@ -97,13 +97,13 @@ ul.icons width: .75em .icon-muted - color: $iconMuted + color: $fontAwesomeMutedColor // Icon Borders // ------------------------- .icon-border - border: solid 1px $borderColor + border: solid 1px $fontAwesomeBorderColor padding: .2em .25em .15em @include border-radius(3px) diff --git a/sass/font-awesome.scss b/sass/font-awesome.scss index 8fb620f9e..e948588de 100644 --- a/sass/font-awesome.scss +++ b/sass/font-awesome.scss @@ -21,11 +21,14 @@ */ -$fontAwesomePath: "../font" !default; -$borderColor: #eee; -$iconMuted: #eee; -@mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; } - +$fontAwesomePath: "../font" !default; +$fontAwesomeBorderColor: #eee !default; +$fontAwesomeMutedColor: #eee !default; +@mixin border-radius($radius) { + -webkit-border-radius: $radius; + -moz-border-radius: $radius; + border-radius: $radius; +} @font-face { font-family: 'FontAwesome'; @@ -115,14 +118,14 @@ ul.icons { } .icon-muted { - color: $iconMuted; + color: $fontAwesomeMutedColor; } // Icon Borders // ------------------------- .icon-border { - border: solid 1px $borderColor; + border: solid 1px $fontAwesomeBorderColor; padding: .2em .25em .15em; @include border-radius(3px); }