From 4c3b45789f457d1633c94ef791afc99171111e99 Mon Sep 17 00:00:00 2001 From: LightGuard Date: Wed, 12 Jun 2013 10:11:37 -0600 Subject: [PATCH 1/3] Fixing interpolation is scss path --- scss/_path.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scss/_path.scss b/scss/_path.scss index f943b26ff..bb3f36b70 100644 --- a/scss/_path.scss +++ b/scss/_path.scss @@ -3,12 +3,12 @@ @font-face { font-family: 'FontAwesome'; - src: url('${FontAwesomePath}/fontawesome-webfont.eot?v=${FontAwesomeVersion}'); - src: url('${FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=${FontAwesomeVersion}') format('embedded-opentype'), - url('${FontAwesomePath}/fontawesome-webfont.woff?v=${FontAwesomeVersion}') format('woff'), - url('${FontAwesomePath}/fontawesome-webfont.ttf?v=${FontAwesomeVersion}') format('truetype'), - url('${FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=${FontAwesomeVersion}') format('svg'); -// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?v=#{$FontAwesomeVersion}'); + src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=#{$FontAwesomeVersion}') format('embedded-opentype'), + url('#{$FontAwesomePath}/fontawesome-webfont.woff?v=#{$FontAwesomeVersion}') format('woff'), + url('#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}') format('truetype'), + url('#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}') format('svg'); +// src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } From 3e6cc9500114b03b77b0c9b28c8ed4cd68813abd Mon Sep 17 00:00:00 2001 From: LightGuard Date: Wed, 12 Jun 2013 10:42:37 -0600 Subject: [PATCH 2/3] Fixing division --- scss/_core.scss | 8 ++++---- scss/_mixins.scss | 2 +- scss/_variables.scss | 2 +- scss/font-awesome-ie7.scss | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scss/_core.scss b/scss/_core.scss index 8199965a3..2ae7d5577 100644 --- a/scss/_core.scss +++ b/scss/_core.scss @@ -17,7 +17,7 @@ /* makes the font 33% larger relative to the icon container */ .icon-large:before { vertical-align: -10%; - font-size: 4/3em; + font-size: (4em/3); } /* makes sure icons active on rollover in links */ @@ -33,11 +33,11 @@ a { [class*=" icon-"] { &.icon-fixed-width { display: inline-block; - width: 16/14em; + width: (16em/14); text-align: right; - padding-right: 4/14em; + padding-right: (4em/14); &.icon-large { - width: 20/14em; + width: (20em/14); } } } diff --git a/scss/_mixins.scss b/scss/_mixins.scss index 4c1a2da3a..ca9c5931b 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -42,7 +42,7 @@ } .icon-stack-base { font-size: $base-font-size; - *line-height: $height / $base-font-size; + *line-height: #{$height / $base-font-size}em; } } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 5aaa3e97a..aa1b2babd 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -6,7 +6,7 @@ $borderColor: #eeeeee !default; $iconMuted: #eeeeee !default; $iconLight: white !default; $iconDark: #333333 !default; -$icons-li-width: 30em/14; +$icons-li-width: (30em/14); $glass: "\f000"; diff --git a/scss/font-awesome-ie7.scss b/scss/font-awesome-ie7.scss index 75f8dcee2..2cf54d003 100644 --- a/scss/font-awesome-ie7.scss +++ b/scss/font-awesome-ie7.scss @@ -26,7 +26,7 @@ @import "variables"; .icon-large { - font-size: 4/3em; + font-size: (4em/3); margin-top: -4px; padding-top: 3px; margin-bottom: -4px; From 61f6d8cc900d54d2b6506aa28dcee4b08e6a57be Mon Sep 17 00:00:00 2001 From: LightGuard Date: Wed, 12 Jun 2013 10:42:54 -0600 Subject: [PATCH 3/3] Bumping the version up to 3.2.0 --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index aa1b2babd..1ca9b86e1 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1,7 +1,7 @@ // Variables $FontAwesomePath: "../font" !default; -$FontAwesomeVersion: "3.1.0" !default; +$FontAwesomeVersion: "3.2.0" !default; $borderColor: #eeeeee !default; $iconMuted: #eeeeee !default; $iconLight: white !default;