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

fixing #690

Browse Source
This commit is contained in:
davegandy 2013-05-04 22:19:59 -04:00
parent 5b900850ab
commit b381eb6d25
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/assets/css/font-awesome.css vendored
View File

@ -80,13 +80,12 @@ a [class*=" icon-"] {
vertical-align: -10%; vertical-align: -10%;
font-size: 1.3333333333333333em; font-size: 1.3333333333333333em;
} }
/* keeps button heights with and without icons the same */
.btn [class^="icon-"], .btn [class^="icon-"],
.nav [class^="icon-"], .nav [class^="icon-"],
.btn [class*=" icon-"], .btn [class*=" icon-"],
.nav [class*=" icon-"] { .nav [class*=" icon-"] {
display: inline; display: inline;
/* keeps button heights with and without icons the same */
} }
.btn [class^="icon-"].icon-large, .btn [class^="icon-"].icon-large,
.nav [class^="icon-"].icon-large, .nav [class^="icon-"].icon-large,
@ -100,13 +99,7 @@ a [class*=" icon-"] {
.nav [class*=" icon-"].icon-spin { .nav [class*=" icon-"].icon-spin {
display: inline-block; display: inline-block;
} }
.nav-tabs [class^="icon-"], /* keeps button heights with and without icons the same */
.nav-pills [class^="icon-"],
.nav-tabs [class*=" icon-"],
.nav-pills [class*=" icon-"] {
/* keeps button heights with and without icons the same */
}
.nav-tabs [class^="icon-"], .nav-tabs [class^="icon-"],
.nav-pills [class^="icon-"], .nav-pills [class^="icon-"],
.nav-tabs [class*=" icon-"], .nav-tabs [class*=" icon-"],
@ -287,20 +280,6 @@ ul.icons-ul > li .icon-li {
transform: rotate(359deg); transform: rotate(359deg);
} }
} }
@-moz-document url-prefix() {
.icon-spin {
height: .9em;
}
.btn .icon-spin {
height: auto;
}
.icon-spin.icon-large {
height: 1.25em;
}
.btn .icon-spin.icon-large {
height: .75em;
}
}
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */ readers do not read off random characters that represent icons */
.icon-glass:before { .icon-glass:before {

11
build/assets/less/font-awesome.less vendored
View File

@ -100,20 +100,20 @@ a {
font-size: 4/3em; font-size: 4/3em;
} }
/* keeps button heights with and without icons the same */
.btn, .nav { .btn, .nav {
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
display: inline; display: inline;
/* keeps button heights with and without icons the same */
&.icon-large { line-height: .9em; } &.icon-large { line-height: .9em; }
&.icon-spin { display: inline-block; } &.icon-spin { display: inline-block; }
} }
} }
/* keeps button heights with and without icons the same */
.nav-tabs, .nav-pills { .nav-tabs, .nav-pills {
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
/* keeps button heights with and without icons the same */
&, &.icon-large { line-height: .9em; } &, &.icon-large { line-height: .9em; }
} }
} }
@ -131,7 +131,6 @@ li, .nav li {
} }
} }
ul.icons-ul { ul.icons-ul {
list-style-type: none; list-style-type: none;
text-indent: -9/14em; text-indent: -9/14em;
@ -278,12 +277,6 @@ ul.icons-ul {
100% { transform: rotate(359deg); } 100% { transform: rotate(359deg); }
} }
@-moz-document url-prefix() {
.icon-spin { height: .9em; }
.btn .icon-spin { height: auto; }
.icon-spin.icon-large { height: 1.25em; }
.btn .icon-spin.icon-large { height: .75em; }
}
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */ readers do not read off random characters that represent icons */