FlandreScarle7/Fork-Awesome
1
0
Fork 0
mirror of https://github.com/ForkAwesome/Fork-Awesome.git synced 2024-12-27 14:01:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
davegandy 2013-10-06 10:09:43 -04:00
commit 53c8b30ca7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/font-awesome.css vendored
View File

@ -45,8 +45,8 @@
/* makes the font 33% larger relative to the icon container */ /* makes the font 33% larger relative to the icon container */
.fa-lg { .fa-lg {
font-size: 1.3333333333333333em; font-size: 1.3333333333333333em;
vertical-align: -15%;
line-height: 0.75em; line-height: 0.75em;
vertical-align: -15%;
} }
/* increased font size for icon-lg */ /* increased font size for icon-lg */
.fa-fixed-width { .fa-fixed-width {

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

@ -1,5 +1,5 @@
@font-face{font-family:'FontAwesome';src:url('../fonts/FontAwesome.otf') format('opentype');font-weight:normal;font-style:normal;}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;} @font-face{font-family:'FontAwesome';src:url('../fonts/FontAwesome.otf') format('opentype');font-weight:normal;font-style:normal;}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}
.fa-lg{font-size:1.3333333333333333em;vertical-align:-15%;line-height:0.75em;} .fa-lg{font-size:1.3333333333333333em;line-height:0.75em;vertical-align:-15%;}
.fa-fixed-width{width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}.fa-fixed-width.fa-lg{width:1.4285714285714286em;} .fa-fixed-width{width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}.fa-fixed-width.fa-lg{width:1.4285714285714286em;}
.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none;}.fa-ul>li{position:relative;} .fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none;}.fa-ul>li{position:relative;}
.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:0.14285714285714285em;text-align:center;}.fa-li.fa-lg{left:-1.8571428571428572em;} .fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:0.14285714285714285em;text-align:center;}.fa-li.fa-lg{left:-1.8571428571428572em;}

2
less/core.less
View File

@ -9,8 +9,8 @@
/* makes the font 33% larger relative to the icon container */ /* makes the font 33% larger relative to the icon container */
.fa-lg { .fa-lg {
font-size: (4em / 3); font-size: (4em / 3);
vertical-align: -15%;
line-height: (3em / 4); line-height: (3em / 4);
vertical-align: -15%;
} }
/* increased font size for icon-lg */ /* increased font size for icon-lg */
.fa-fixed-width { .fa-fixed-width {

2
src/assets/font-awesome/less/core.less vendored
View File

@ -11,8 +11,8 @@
/* makes the font 33% larger relative to the icon container */ /* makes the font 33% larger relative to the icon container */
.{{ site.fontawesome.css_prefix }}-lg { .{{ site.fontawesome.css_prefix }}-lg {
font-size: (4em / 3); font-size: (4em / 3);
vertical-align: -15%;
line-height: (3em / 4); line-height: (3em / 4);
vertical-align: -15%;
} }
/* increased font size for icon-lg */ /* increased font size for icon-lg */
.{{ site.fontawesome.css_prefix }}-fixed-width { .{{ site.fontawesome.css_prefix }}-fixed-width {