From b7976b8a108a906383bb6ff8f573022c138ef4ec Mon Sep 17 00:00:00 2001
From: Alvin Ling <alvinyling@gmail.com>
Date: Fri, 4 Jan 2013 11:17:45 -0500
Subject: [PATCH] Prefixed SASS/SCSS variables to avoid conflicts, set
 variables as !default

---
 sass/font-awesome.sass | 10 +++++-----
 sass/font-awesome.scss | 16 ++++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/sass/font-awesome.sass b/sass/font-awesome.sass
index 8d54b9047..a53ed45f8 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 6f3496916..28040d33b 100644
--- a/sass/font-awesome.scss
+++ b/sass/font-awesome.scss
@@ -21,10 +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 {
@@ -115,14 +119,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);
 }