root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar

This commit is contained in:
Mark Otto 2012-09-12 16:37:41 -07:00
parent e1deba30aa
commit 15bb78ce80
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3445,10 +3445,13 @@ input[type="submit"].btn.btn-mini {
.btn-group { .btn-group {
position: relative; position: relative;
display: inline-block;
*display: inline;
*margin-left: .3em; *margin-left: .3em;
font-size: 0; font-size: 0;
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: middle;
*zoom: 1;
} }
.btn-group:first-child { .btn-group:first-child {
@ -3465,14 +3468,6 @@ input[type="submit"].btn.btn-mini {
font-size: 0; font-size: 0;
} }
.btn-toolbar .btn-group {
display: inline-block;
*display: inline;
/* IE7 inline-block hack */
*zoom: 1;
}
.btn-toolbar .btn + .btn, .btn-toolbar .btn + .btn,
.btn-toolbar .btn-group + .btn, .btn-toolbar .btn-group + .btn,
.btn-toolbar .btn + .btn-group { .btn-toolbar .btn + .btn-group {

6
less/button-groups.less
View File

@ -6,6 +6,8 @@
// Make the div behave like a button // Make the div behave like a button
.btn-group { .btn-group {
position: relative; position: relative;
display: inline-block;
.ie7-inline-block();
font-size: 0; // remove as part 1 of font-size inline-block hack font-size: 0; // remove as part 1 of font-size inline-block hack
vertical-align: middle; // match .btn alignment given font-size hack above 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) 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 font-size: 0; // Hack to remove whitespace that results from using inline-block
margin-top: @baseLineHeight / 2; margin-top: @baseLineHeight / 2;
margin-bottom: @baseLineHeight / 2; margin-bottom: @baseLineHeight / 2;
.btn-group {
display: inline-block;
.ie7-inline-block();
}
.btn + .btn, .btn + .btn,
.btn-group + .btn, .btn-group + .btn,
.btn + .btn-group { .btn + .btn-group {