From bbadd429a8e4704c55ac0d9a228decf4a77f484a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 12 Sep 2012 15:48:56 -0700 Subject: change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation --- less/button-groups.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index 62e53f373..7bd639aac 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -120,7 +120,7 @@ .btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; - .box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); + .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); *padding-top: 5px; *padding-bottom: 5px; } @@ -147,7 +147,7 @@ // Remove the gradient and set the same inset shadow as the :active state .dropdown-toggle { background-image: none; - .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); + .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); } // Keep the hover's background when dropdown is open -- cgit v1.2.3 From 15bb78ce800dc74dfd5eed98f3d256ce095ccab0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 12 Sep 2012 16:37:41 -0700 Subject: fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar --- less/button-groups.less | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index 7bd639aac..dcae11336 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -6,6 +6,8 @@ // Make the div behave like a button .btn-group { position: relative; + display: inline-block; + .ie7-inline-block(); font-size: 0; // remove as part 1 of font-size inline-block hack vertical-align: middle; // match .btn alignment given font-size hack above white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page) @@ -22,10 +24,6 @@ font-size: 0; // Hack to remove whitespace that results from using inline-block margin-top: @baseLineHeight / 2; margin-bottom: @baseLineHeight / 2; - .btn-group { - display: inline-block; - .ie7-inline-block(); - } .btn + .btn, .btn-group + .btn, .btn + .btn-group { -- cgit v1.2.3 From cc3de8bd6eefe0c3edf3d3ef843276e0f4daae1e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 18 Sep 2012 12:00:57 -0700 Subject: fixes #5177: remove color on .btn-large .caret, but keep sizing change; also start to add CSS tests for buttons --- less/button-groups.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index dcae11336..46837e628 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -191,8 +191,7 @@ } // Upside down carets for .dropup .dropup .btn-large .caret { - border-bottom: 5px solid @black; - border-top: 0; + border-bottom-width: 5px; } -- cgit v1.2.3