FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2025-01-15 17:50:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed sizes.* to return em values instead of px.

Browse Source
This commit is contained in:
Macdonald, Zak 2015-07-02 20:46:11 -07:00
parent 80ddc308b1
commit 7e0b75e2b7
7 changed files with 27 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
css/font-awesome.css vendored
View File

@ -19,41 +19,41 @@
transform: translate(0, 0);
}
.fa-default {
font-size: 14px;
line-height: 10px;
font-size: 1em;
line-height: 0.75em;
vertical-align: -15%;
}
.fa-lg {
font-size: 18px;
line-height: 13px;
font-size: 1.333em;
line-height: 0.99975em;
vertical-align: -15%;
}
.fa-sm {
font-size: 9px;
line-height: 6px;
font-size: 0.666em;
line-height: 0.4995em;
vertical-align: -15%;
}
.fa-xl {
font-size: 23px;
line-height: 17px;
font-size: 1.666em;
line-height: 1.2495em;
vertical-align: -15%;
}
.fa-xs {
font-size: 4px;
line-height: 3px;
font-size: 0.333em;
line-height: 0.24975em;
vertical-align: -15%;
}
.fa-2x {
font-size: 28px;
font-size: 2em;
}
.fa-3x {
font-size: 42px;
font-size: 3em;
}
.fa-4x {
font-size: 56px;
font-size: 4em;
}
.fa-5x {
font-size: 70px;
font-size: 5em;
}
.fa-fw {
width: 1.28571429em;

2
css/font-awesome.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
less/sizes.less
View File

@ -8,8 +8,8 @@
@fa-icon-scale: extract(extract(@fa-var-scales, @iterator), 2);
.@{fa-css-prefix}-@{fa-icon-scale-name-unquoted} {
font-size: floor(@fa-font-size-base * @fa-icon-scale);
line-height: floor(@fa-font-size-base * @fa-icon-scale * 0.75);
font-size: unit(@fa-icon-scale, em);
line-height: unit(@fa-icon-scale * 0.75, em);
vertical-align: -15%;
}
.createIconScales((@iterator + 1));
@ -23,7 +23,7 @@
@fa-icon-multiplier: extract(extract(@fa-var-multipliers, @iterator), 2);
.@{fa-css-prefix}-@{fa-icon-multiplier-name-unquoted} {
font-size: floor(@fa-font-size-base * @fa-icon-multiplier);
font-size: unit(@fa-icon-multiplier, em);
}
.createIconMultipliers((@iterator + 1));
}

18
scss/_larger.scss
View File

@ -1,18 +0,0 @@
// icon sizes
// -------------------------
// scale icon size by n
@each $fa-icon-scale-name, $fa-icon-scale in $fa-var-scales {
.#{$fa-css-prefix}-#{$fa-icon-scale-name} {
font-size: #{fudge(unitless($fa-font-size-base) * $fa-icon-scale)}px;
line-height: #{fudge(unitless($fa-font-size-base) * $fa-icon-scale * 0.75)}px;
vertical-align: -15%;
}
}
// multiply icon size by n
@each $fa-icon-multiplier-name, $fa-icon-multiplier in $fa-var-multipliers {
.#{$fa-css-prefix}-#{$fa-icon-multiplier-name} {
font-size: #{fudge($fa-font-size-base * $fa-icon-multiplier)}px;
}
}

6
scss/_sizes.scss
View File

@ -4,8 +4,8 @@
// scale icon size by n
@each $fa-icon-scale-name, $fa-icon-scale in $fa-var-scales {
.#{$fa-css-prefix}-#{$fa-icon-scale-name} {
font-size: #{fudge(unitless($fa-font-size-base) * $fa-icon-scale)}px;
line-height: #{fudge(unitless($fa-font-size-base) * $fa-icon-scale * 0.75)}px;
font-size: #{$fa-icon-scale}em;
line-height: #{$fa-icon-scale * 0.75}em;
vertical-align: -15%;
}
}
@ -13,6 +13,6 @@
// multiply icon size by n
@each $fa-icon-multiplier-name, $fa-icon-multiplier in $fa-var-multipliers {
.#{$fa-css-prefix}-#{$fa-icon-multiplier-name} {
font-size: #{fudge($fa-font-size-base * $fa-icon-multiplier)}px;
font-size: #{$fa-icon-multiplier}em;
}
}

6
src/assets/font-awesome/less/sizes.less vendored
View File

@ -11,8 +11,8 @@
@fa-icon-scale: extract(extract(@fa-var-scales, @iterator), 2);
.@{fa-css-prefix}-@{fa-icon-scale-name-unquoted} {
font-size: floor(@fa-font-size-base * @fa-icon-scale);
line-height: floor(@fa-font-size-base * @fa-icon-scale * 0.75);
font-size: unit(@fa-icon-scale, em);
line-height: unit(@fa-icon-scale * 0.75, em);
vertical-align: -15%;
}
.createIconScales((@iterator + 1));
@ -26,7 +26,7 @@
@fa-icon-multiplier: extract(extract(@fa-var-multipliers, @iterator), 2);
.@{fa-css-prefix}-@{fa-icon-multiplier-name-unquoted} {
font-size: floor(@fa-font-size-base * @fa-icon-multiplier);
font-size: unit(@fa-icon-multiplier, em);
}
.createIconMultipliers((@iterator + 1));
}

6
src/assets/font-awesome/scss/_sizes.scss vendored
View File

@ -7,8 +7,8 @@
// scale icon size by n
@each $fa-icon-scale-name, $fa-icon-scale in $fa-var-scales {
.#{$fa-css-prefix}-#{$fa-icon-scale-name} {
font-size: #{fudge(unitless($fa-font-size-base) * $fa-icon-scale)}px;
line-height: #{fudge(unitless($fa-font-size-base) * $fa-icon-scale * 0.75)}px;
font-size: #{$fa-icon-scale}em;
line-height: #{$fa-icon-scale * 0.75}em;
vertical-align: -15%;
}
}
@ -16,6 +16,6 @@
// multiply icon size by n
@each $fa-icon-multiplier-name, $fa-icon-multiplier in $fa-var-multipliers {
.#{$fa-css-prefix}-#{$fa-icon-multiplier-name} {
font-size: #{fudge($fa-font-size-base * $fa-icon-multiplier)}px;
font-size: #{$fa-icon-multiplier}em;
}
}