root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'amid2887-master' into 2.1.2-wip

This commit is contained in:
Mark Otto 2012-09-30 22:41:11 -07:00
parent a4a6244eb7 d49dd766c8
commit 40a8a93b22
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
less/buttons.less
View File

@ -77,7 +77,8 @@
font-size: @fontSizeLarge; font-size: @fontSizeLarge;
.border-radius(@borderRadiusLarge); .border-radius(@borderRadiusLarge);
} }
.btn-large [class^="icon-"] { .btn-large [class^="icon-"],
.btn-large [class*=" icon-"] {
margin-top: 2px; margin-top: 2px;
} }
@ -87,7 +88,8 @@
font-size: @fontSizeSmall; font-size: @fontSizeSmall;
.border-radius(@borderRadiusSmall); .border-radius(@borderRadiusSmall);
} }
.btn-small [class^="icon-"] { .btn-small [class^="icon-"],
.btn-small [class*=" icon-"] {
margin-top: 0; margin-top: 0;
} }