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

Prefixed SASS/SCSS variables to avoid conflicts, set variables as !default

Browse Source
This commit is contained in:
Alvin Ling 2013-01-04 11:17:45 -05:00
parent 16b6298026
commit b7976b8a10
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sass/font-awesome.sass
View File

@ -19,9 +19,9 @@
* Twitter: http://twitter.com/fortaweso_me * Twitter: http://twitter.com/fortaweso_me
* Work: Lead Product Designer @ http://kyruus.com * Work: Lead Product Designer @ http://kyruus.com
$fontAwesomePath: "../font" !default $fontAwesomePath: "../font" !default
$borderColor: #eee $fontAwesomeBorderColor: #eee !default
$iconMuted: #eee $fontAwesomeMutedColor: #eee !default
@mixin border-radius($radius) @mixin border-radius($radius)
-webkit-border-radius: $radius -webkit-border-radius: $radius
-moz-border-radius: $radius -moz-border-radius: $radius
@ -97,13 +97,13 @@ ul.icons
width: .75em width: .75em
.icon-muted .icon-muted
color: $iconMuted color: $fontAwesomeMutedColor
// Icon Borders // Icon Borders
// ------------------------- // -------------------------
.icon-border .icon-border
border: solid 1px $borderColor border: solid 1px $fontAwesomeBorderColor
padding: .2em .25em .15em padding: .2em .25em .15em
@include border-radius(3px) @include border-radius(3px)

16
sass/font-awesome.scss vendored
View File

@ -21,10 +21,14 @@
*/ */
$fontAwesomePath: "../font" !default; $fontAwesomePath: "../font" !default;
$borderColor: #eee; $fontAwesomeBorderColor: #eee !default;
$iconMuted: #eee; $fontAwesomeMutedColor: #eee !default;
@mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; } @mixin border-radius($radius) {
-webkit-border-radius: $radius;
-moz-border-radius: $radius;
border-radius: $radius;
}
@font-face { @font-face {
@ -115,14 +119,14 @@ ul.icons {
} }
.icon-muted { .icon-muted {
color: $iconMuted; color: $fontAwesomeMutedColor;
} }
// Icon Borders // Icon Borders
// ------------------------- // -------------------------
.icon-border { .icon-border {
border: solid 1px $borderColor; border: solid 1px $fontAwesomeBorderColor;
padding: .2em .25em .15em; padding: .2em .25em .15em;
@include border-radius(3px); @include border-radius(3px);
} }