mirror of
https://github.com/ForkAwesome/Fork-Awesome.git
synced 2024-12-27 14:01:32 +08:00
Merge pull request #1247 from LightGuard/3.2.0-wip
Fixing interpolation is scss path
This commit is contained in:
commit
d6374ff74b
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -1,12 +1,12 @@
|
||||
// Variables
|
||||
|
||||
$FontAwesomePath: "../font" !default;
|
||||
$FontAwesomeVersion: "3.1.0" !default;
|
||||
$FontAwesomeVersion: "3.2.0" !default;
|
||||
$borderColor: #eeeeee !default;
|
||||
$iconMuted: #eeeeee !default;
|
||||
$iconLight: white !default;
|
||||
$iconDark: #333333 !default;
|
||||
$icons-li-width: 30em/14;
|
||||
$icons-li-width: (30em/14);
|
||||
|
||||
|
||||
$glass: "\f000";
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user