diff options
| author | Mark Otto <[email protected]> | 2012-01-27 16:35:32 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 16:35:32 -0800 |
| commit | d9759abeebbca0681054f8da3ff7c3029948284e (patch) | |
| tree | c78f1198898b07fdc8911a3d3310dd2e5f5ed355 /less/button-groups.less | |
| parent | f6dc566963c63d5113e72f0098ad9da2c414f33f (diff) | |
| parent | 84b9a1bfb6ff5d1406f5c0393d6556caff6de40c (diff) | |
| download | bootstrap-d9759abeebbca0681054f8da3ff7c3029948284e.tar.xz bootstrap-d9759abeebbca0681054f8da3ff7c3029948284e.zip | |
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components
Conflicts:
docs/assets/css/bootstrap.css
Diffstat (limited to 'less/button-groups.less')
| -rw-r--r-- | less/button-groups.less | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index 5fb0a8e97..a058f0344 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -6,6 +6,7 @@ .btn-group { position: relative; .clearfix(); // clears the floated buttons + .ie7-restore-left-whitespace; } // Space out series of button groups @@ -17,6 +18,7 @@ .btn-toolbar { .btn-group { display: inline-block; + .ie7-inline-block; } } @@ -83,18 +85,27 @@ padding-right: 8px; @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(@shadow); + *padding-top: 5px; + *padding-bottom: 5px; } -// Reposition menu on open and round all corners -.btn-group.open .dropdown-menu { - display: block; - margin-top: 1px; - .border-radius(5px); -} -.btn-group.open .dropdown-toggle { - background-image: none; - @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); +.btn-group.open { + // IE7's z-index only goes to the nearest positioned ancestor, which would + // make the menu appear below buttons that appeared later on the page + *z-index: @zindexDropdown; + + // Reposition menu on open and round all corners + .dropdown-menu { + display: block; + margin-top: 1px; + .border-radius(5px); + } + + .dropdown-toggle { + background-image: none; + @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + } } // Reposition the caret |