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

update to make compatible with Foundation

Browse Source 
just include .button alongside .btn
This commit is contained in:
Scott McCauley 2013-03-04 09:59:01 -05:00
parent 13d5dd373c
commit d828502f91
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sass/font-awesome.sass
View File

@ -93,7 +93,7 @@ a
vertical-align: -10% vertical-align: -10%
font-size: 1.3333333333333333em font-size: 1.3333333333333333em
.btn, .nav .btn, .button, .nav
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] [class*=" icon-"]
display: inline display: inline
@ -177,7 +177,7 @@ ul.icons
&.pull-right &.pull-right
margin-left: .3em margin-left: .3em
.btn .btn, .button
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] [class*=" icon-"]
&.pull-left, &.pull-right &.pull-left, &.pull-right
@ -186,14 +186,14 @@ ul.icons
&.icon-spin.icon-large &.icon-spin.icon-large
line-height: .8em line-height: .8em
.btn.btn-small .btn.btn-small, .button.small
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] [class*=" icon-"]
&.pull-left, &.pull-right &.pull-left, &.pull-right
&.icon-2x &.icon-2x
margin-top: .25em margin-top: .25em
.btn.btn-large .btn.btn-large, .button.large
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] [class*=" icon-"]
margin-top: 0 // overrides bootstrap default margin-top: 0 // overrides bootstrap default
@ -246,11 +246,11 @@ ul.icons
@-moz-document url-prefix() @-moz-document url-prefix()
.icon-spin .icon-spin
height: .9em height: .9em
.btn .icon-spin .btn .icon-spin, .button .icon-spin
height: auto height: auto
.icon-spin.icon-large .icon-spin.icon-large
height: 1.25em height: 1.25em
.btn .icon-spin.icon-large .btn .icon-spin.icon-large, .button .icon-spin.icon-large
height: .75em height: .75em

10
sass/font-awesome.scss vendored
View File

@ -97,7 +97,7 @@ a {
font-size: 1.3333333333333333em; font-size: 1.3333333333333333em;
} }
.btn, .nav { .btn, .button, .nav {
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
display: inline; display: inline;
@ -195,7 +195,7 @@ ul.icons {
} }
} }
.btn { .btn, .button {
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
&.pull-left, &.pull-right { &.pull-left, &.pull-right {
@ -205,7 +205,7 @@ ul.icons {
} }
} }
.btn.btn-small { .btn.btn-small, .button.small {
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
&.pull-left, &.pull-right { &.pull-left, &.pull-right {
@ -258,9 +258,9 @@ ul.icons {
@-moz-document url-prefix() { @-moz-document url-prefix() {
.icon-spin { height: .9em; } .icon-spin { height: .9em; }
.btn .icon-spin { height: auto; } .btn .icon-spin, .button .icon-spin { height: auto; }
.icon-spin.icon-large { height: 1.25em; } .icon-spin.icon-large { height: 1.25em; }
.btn .icon-spin.icon-large { height: .75em; } .btn .icon-spin.icon-large, .button .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