mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-03 02:13:01 +02:00
Code Issues Releases Wiki Activity

fix #2913: get more specific with button group selectors

Browse Source
This commit is contained in:
Mark Otto
2012-04-02 22:37:58 -07:00
parent 7bf4c8e76e
commit 2988de6377
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

30
docs/assets/css/bootstrap.css vendored
View File

@@ -2372,7 +2372,7 @@ input[type="submit"].btn.btn-mini {
*zoom: 1; *zoom: 1;
} }
.btn-group .btn { .btn-group > .btn {
position: relative; position: relative;
float: left; float: left;
margin-left: -1px; margin-left: -1px;
@@ -2380,7 +2380,7 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
.btn-group .btn:first-child { .btn-group > .btn:first-child {
margin-left: 0; margin-left: 0;
-webkit-border-top-left-radius: 4px; -webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px; -moz-border-radius-topleft: 4px;
@@ -2389,8 +2389,8 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius-bottomleft: 4px; -moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.btn-group .btn:last-child, .btn-group > .btn:last-child,
.btn-group .dropdown-toggle { .btn-group > .dropdown-toggle {
-webkit-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px; -moz-border-radius-topright: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
@@ -2398,7 +2398,7 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius-bottomright: 4px; -moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
} }
.btn-group .btn.large:first-child { .btn-group > .btn.large:first-child {
margin-left: 0; margin-left: 0;
-webkit-border-top-left-radius: 6px; -webkit-border-top-left-radius: 6px;
-moz-border-radius-topleft: 6px; -moz-border-radius-topleft: 6px;
@@ -2407,8 +2407,8 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius-bottomleft: 6px; -moz-border-radius-bottomleft: 6px;
border-bottom-left-radius: 6px; border-bottom-left-radius: 6px;
} }
.btn-group .btn.large:last-child, .btn-group > .btn.large:last-child,
.btn-group .large.dropdown-toggle { .btn-group > .large.dropdown-toggle {
-webkit-border-top-right-radius: 6px; -webkit-border-top-right-radius: 6px;
-moz-border-radius-topright: 6px; -moz-border-radius-topright: 6px;
border-top-right-radius: 6px; border-top-right-radius: 6px;
@@ -2416,17 +2416,17 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius-bottomright: 6px; -moz-border-radius-bottomright: 6px;
border-bottom-right-radius: 6px; border-bottom-right-radius: 6px;
} }
.btn-group .btn:hover, .btn-group > .btn:hover,
.btn-group .btn:focus, .btn-group > .btn:focus,
.btn-group .btn:active, .btn-group > .btn:active,
.btn-group .btn.active { .btn-group > .btn.active {
z-index: 2; z-index: 2;
} }
.btn-group .dropdown-toggle:active, .btn-group .dropdown-toggle:active,
.btn-group.open .dropdown-toggle { .btn-group.open .dropdown-toggle {
outline: 0; outline: 0;
} }
.btn-group .dropdown-toggle { .btn-group > .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
-webkit-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); -webkit-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);
@@ -2435,17 +2435,17 @@ input[type="submit"].btn.btn-mini {
*padding-top: 3px; *padding-top: 3px;
*padding-bottom: 3px; *padding-bottom: 3px;
} }
.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-top: 1px;
*padding-bottom: 1px; *padding-bottom: 1px;
} }
.btn-group .btn-small.dropdown-toggle { .btn-group > .btn-small.dropdown-toggle {
*padding-top: 4px; *padding-top: 4px;
*padding-bottom: 4px; *padding-bottom: 4px;
} }
.btn-group .btn-large.dropdown-toggle { .btn-group > .btn-large.dropdown-toggle {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }

30
less/button-groups.less
View File

@@ -25,14 +25,14 @@
} }
// Float them, remove border radius, then re-add to first and last elements // Float them, remove border radius, then re-add to first and last elements
.btn-group .btn { .btn-group > .btn {
position: relative; position: relative;
float: left; float: left;
margin-left: -1px; margin-left: -1px;
.border-radius(0); .border-radius(0);
} }
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
.btn-group .btn:first-child { .btn-group > .btn:first-child {
margin-left: 0; margin-left: 0;
-webkit-border-top-left-radius: 4px; -webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px; -moz-border-radius-topleft: 4px;
@@ -41,8 +41,8 @@
-moz-border-radius-bottomleft: 4px; -moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.btn-group .btn:last-child, .btn-group > .btn:last-child,
.btn-group .dropdown-toggle { .btn-group > .dropdown-toggle {
-webkit-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px; -moz-border-radius-topright: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
@@ -51,7 +51,7 @@
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
} }
// Reset corners for large buttons // Reset corners for large buttons
.btn-group .btn.large:first-child { .btn-group > .btn.large:first-child {
margin-left: 0; margin-left: 0;
-webkit-border-top-left-radius: 6px; -webkit-border-top-left-radius: 6px;
-moz-border-radius-topleft: 6px; -moz-border-radius-topleft: 6px;
@@ -60,8 +60,8 @@
-moz-border-radius-bottomleft: 6px; -moz-border-radius-bottomleft: 6px;
border-bottom-left-radius: 6px; border-bottom-left-radius: 6px;
} }
.btn-group .btn.large:last-child, .btn-group > .btn.large:last-child,
.btn-group .large.dropdown-toggle { .btn-group > .large.dropdown-toggle {
-webkit-border-top-right-radius: 6px; -webkit-border-top-right-radius: 6px;
-moz-border-radius-topright: 6px; -moz-border-radius-topright: 6px;
border-top-right-radius: 6px; border-top-right-radius: 6px;
@@ -71,10 +71,10 @@
} }
// On hover/focus/active, bring the proper btn to front // On hover/focus/active, bring the proper btn to front
.btn-group .btn:hover, .btn-group > .btn:hover,
.btn-group .btn:focus, .btn-group > .btn:focus,
.btn-group .btn:active, .btn-group > .btn:active,
.btn-group .btn.active { .btn-group > .btn.active {
z-index: 2; z-index: 2;
} }
@@ -90,24 +90,24 @@
// ---------------------- // ----------------------
// Give the line between buttons some depth // Give the line between buttons some depth
.btn-group .dropdown-toggle { .btn-group > .dropdown-toggle {
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: 3px;
*padding-bottom: 3px; *padding-bottom: 3px;
} }
.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-top: 1px;
*padding-bottom: 1px; *padding-bottom: 1px;
} }
.btn-group .btn-small.dropdown-toggle { .btn-group > .btn-small.dropdown-toggle {
*padding-top: 4px; *padding-top: 4px;
*padding-bottom: 4px; *padding-bottom: 4px;
} }
.btn-group .btn-large.dropdown-toggle { .btn-group > .btn-large.dropdown-toggle {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }