Merge branch 'amid2887-master' into 2.1.2-wip

40a8a93b · Mark Otto · a4a6244e · d49dd766 · 40a8a93b
Commit 40a8a93b authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 2 deletions
+4 -2
--- 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;
 }