From 1c2db11d58cfb35ab513d104eb845b4dce34f750 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Apr 2012 01:46:20 -0700 Subject: [PATCH] fix ie7 button group toggles and button borders --- docs/assets/css/bootstrap.css | 7 +++---- less/button-groups.less | 6 ++---- less/buttons.less | 4 +++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ee5b63fd0d0d..8037a33a8881 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2696,6 +2696,7 @@ button.close { .btn { border-color: #ccc; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn-primary { @@ -3007,9 +3008,9 @@ input[type="submit"].btn.btn-mini { } .btn-group > .dropdown-toggle { - *padding-top: 3px; + *padding-top: 4px; padding-right: 8px; - *padding-bottom: 3px; + *padding-bottom: 4px; padding-left: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -3017,9 +3018,7 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn-mini.dropdown-toggle { - *padding-top: 1px; padding-right: 5px; - *padding-bottom: 1px; padding-left: 5px; } diff --git a/less/button-groups.less b/less/button-groups.less index 023adcb5e630..5338c5a4502c 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -95,14 +95,12 @@ 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)"); - *padding-top: 3px; - *padding-bottom: 3px; + *padding-top: 4px; + *padding-bottom: 4px; } .btn-group > .btn-mini.dropdown-toggle { padding-left: 5px; padding-right: 5px; - *padding-top: 1px; - *padding-bottom: 1px; } .btn-group > .btn-small.dropdown-toggle { *padding-top: 4px; diff --git a/less/buttons.less b/less/buttons.less index 2b5f24499bbc..c44ff3e6fc63 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -132,7 +132,9 @@ // Set the backgrounds // ------------------------- .btn { - border-color: #ccc; // reset here as of 2.0.3 due to Recess property order + // reset here as of 2.0.3 due to Recess property order + border-color: #ccc; + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25); } .btn-primary { .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);