Merge branch 'amid2887-master' into 2.1.2-wip

mdo · mdo · commit 40a8a93b22b4 · 2012-09-30T22:41:11.000-07:00
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@`
`77`	`77`	`font-size: @fontSizeLarge;`
`78`	`78`	`.border-radius(@borderRadiusLarge);`
`79`	`79`	`}`
`80`		`-.btn-large [class^="icon-"] {`
	`80`	`+.btn-large [class^="icon-"],`
	`81`	`+.btn-large [class*=" icon-"] {`
`81`	`82`	`margin-top: 2px;`
`82`	`83`	`}`
`83`	`84`
`@@ -87,7 +88,8 @@`
`87`	`88`	`font-size: @fontSizeSmall;`
`88`	`89`	`.border-radius(@borderRadiusSmall);`
`89`	`90`	`}`
`90`		`-.btn-small [class^="icon-"] {`
	`91`	`+.btn-small [class^="icon-"],`
	`92`	`+.btn-small [class*=" icon-"] {`
`91`	`93`	`margin-top: 0;`
`92`	`94`	`}`
`93`	`95`