Skip to content

B
bootstrap
Commit 1c2db11d authored by Mark Otto's avatar Mark Otto
Browse files
Options

fix ie7 button group toggles and button borders

parent 805ca034
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
docs/assets/css/bootstrap.css
View file @ 1c2db11d
...@@ -2696,6 +2696,7 @@ button.close { ...@@ -2696,6 +2696,7 @@ button.close {
.btn { .btn {
border-color: #ccc; 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 { .btn-primary {
...@@ -3007,9 +3008,9 @@ input[type="submit"].btn.btn-mini { ...@@ -3007,9 +3008,9 @@ input[type="submit"].btn.btn-mini {
} }
.btn-group > .dropdown-toggle { .btn-group > .dropdown-toggle {
*padding-top: 3px; *padding-top: 4px;
padding-right: 8px; padding-right: 8px;
*padding-bottom: 3px; *padding-bottom: 4px;
padding-left: 8px; 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); -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); -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 { ...@@ -3017,9 +3018,7 @@ input[type="submit"].btn.btn-mini {
} }
.btn-group > .btn-mini.dropdown-toggle { .btn-group > .btn-mini.dropdown-toggle {
*padding-top: 1px;
padding-right: 5px; padding-right: 5px;
*padding-bottom: 1px;
padding-left: 5px; padding-left: 5px;
} }
......
less/button-groups.less
View file @ 1c2db11d
...@@ -95,14 +95,12 @@ ...@@ -95,14 +95,12 @@
padding-left: 8px; padding-left: 8px;
padding-right: 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: 3px; *padding-top: 4px;
*padding-bottom: 3px; *padding-bottom: 4px;
} }
.btn-group > .btn-mini.dropdown-toggle { .btn-group > .btn-mini.dropdown-toggle {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
*padding-top: 1px;
*padding-bottom: 1px;
} }
.btn-group > .btn-small.dropdown-toggle { .btn-group > .btn-small.dropdown-toggle {
*padding-top: 4px; *padding-top: 4px;
......
less/buttons.less
View file @ 1c2db11d
...@@ -132,7 +132,9 @@ ...@@ -132,7 +132,9 @@
// Set the backgrounds // Set the backgrounds
// ------------------------- // -------------------------
.btn { .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 { .btn-primary {
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment