aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-30 22:41:11 -0700
committerMark Otto <[email protected]>2012-09-30 22:41:11 -0700
commit40a8a93b22b43629ae2f879a1dbae64bade5db49 (patch)
tree3f9cd050b59df9bbef4340311f3df00da36651fe
parenta4a6244eb7a7514ad7410403bf5b60d1bf3e88b0 (diff)
parentd49dd766c87ce97dc45f37f3198841ca4e02d9e6 (diff)
downloadbootstrap-40a8a93b22b43629ae2f879a1dbae64bade5db49.tar.xz
bootstrap-40a8a93b22b43629ae2f879a1dbae64bade5db49.zip
Merge branch 'amid2887-master' into 2.1.2-wip
-rw-r--r--less/buttons.less6
1 files changed, 4 insertions, 2 deletions
diff --git a/less/buttons.less b/less/buttons.less
index 223d7439b..1f9ceda9f 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -77,7 +77,8 @@
font-size: @fontSizeLarge;
.border-radius(@borderRadiusLarge);
}
-.btn-large [class^="icon-"] {
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
margin-top: 2px;
}
@@ -87,7 +88,8 @@
font-size: @fontSizeSmall;
.border-radius(@borderRadiusSmall);
}
-.btn-small [class^="icon-"] {
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
margin-top: 0;
}