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

Merge pull request #1247 from LightGuard/3.2.0-wip

Browse Source 
Fixing interpolation is scss path
This commit is contained in:
Dave Gandy 2013-06-12 11:00:30 -07:00
commit d6374ff74b
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scss/_core.scss
View File

@ -17,7 +17,7 @@
/* makes the font 33% larger relative to the icon container */ /* makes the font 33% larger relative to the icon container */
.icon-large:before { .icon-large:before {
vertical-align: -10%; vertical-align: -10%;
font-size: 4/3em; font-size: (4em/3);
} }
/* makes sure icons active on rollover in links */ /* makes sure icons active on rollover in links */
@ -33,11 +33,11 @@ a {
[class*=" icon-"] { [class*=" icon-"] {
&.icon-fixed-width { &.icon-fixed-width {
display: inline-block; display: inline-block;
width: 16/14em; width: (16em/14);
text-align: right; text-align: right;
padding-right: 4/14em; padding-right: (4em/14);
&.icon-large { &.icon-large {
width: 20/14em; width: (20em/14);
} }
} }
} }

2
scss/_mixins.scss
View File

@ -42,7 +42,7 @@
} }
.icon-stack-base { .icon-stack-base {
font-size: $base-font-size; font-size: $base-font-size;
*line-height: $height / $base-font-size; *line-height: #{$height / $base-font-size}em;
} }
} }
} }

12
scss/_path.scss
View File

@ -3,12 +3,12 @@
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome';
src: url('${FontAwesomePath}/fontawesome-webfont.eot?v=${FontAwesomeVersion}'); src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?v=#{$FontAwesomeVersion}');
src: url('${FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=${FontAwesomeVersion}') format('embedded-opentype'), 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.woff?v=#{$FontAwesomeVersion}') format('woff'),
url('${FontAwesomePath}/fontawesome-webfont.ttf?v=${FontAwesomeVersion}') format('truetype'), url('#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}') format('truetype'),
url('${FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=${FontAwesomeVersion}') format('svg'); 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.otf') format('opentype'); // used when developing fonts
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

4
scss/_variables.scss
View File

@ -1,12 +1,12 @@
// Variables // Variables
$FontAwesomePath: "../font" !default; $FontAwesomePath: "../font" !default;
$FontAwesomeVersion: "3.1.0" !default; $FontAwesomeVersion: "3.2.0" !default;
$borderColor: #eeeeee !default; $borderColor: #eeeeee !default;
$iconMuted: #eeeeee !default; $iconMuted: #eeeeee !default;
$iconLight: white !default; $iconLight: white !default;
$iconDark: #333333 !default; $iconDark: #333333 !default;
$icons-li-width: 30em/14; $icons-li-width: (30em/14);
$glass: "\f000"; $glass: "\f000";

2
scss/font-awesome-ie7.scss
View File

@ -26,7 +26,7 @@
@import "variables"; @import "variables";
.icon-large { .icon-large {
font-size: 4/3em; font-size: (4em/3);
margin-top: -4px; margin-top: -4px;
padding-top: 3px; padding-top: 3px;
margin-bottom: -4px; margin-bottom: -4px;