diff options
| author | Mark Otto <[email protected]> | 2012-09-12 16:37:41 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-12 16:37:41 -0700 |
| commit | 15bb78ce800dc74dfd5eed98f3d256ce095ccab0 (patch) | |
| tree | 605fb69870bfc2af9f55db884cdeecae4d412b10 | |
| parent | e1deba30aa6b894aa8228cc9bfcec8490df47873 (diff) | |
| download | bootstrap-15bb78ce800dc74dfd5eed98f3d256ce095ccab0.tar.xz bootstrap-15bb78ce800dc74dfd5eed98f3d256ce095ccab0.zip | |
fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar
| -rw-r--r-- | docs/assets/css/bootstrap.css | 11 | ||||
| -rw-r--r-- | less/button-groups.less | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 37700b36c..654da5b89 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3445,10 +3445,13 @@ input[type="submit"].btn.btn-mini { .btn-group { position: relative; + display: inline-block; + *display: inline; *margin-left: .3em; font-size: 0; white-space: nowrap; vertical-align: middle; + *zoom: 1; } .btn-group:first-child { @@ -3465,14 +3468,6 @@ input[type="submit"].btn.btn-mini { 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-group + .btn, .btn-toolbar .btn + .btn-group { diff --git a/less/button-groups.less b/less/button-groups.less index 7bd639aac..dcae11336 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -6,6 +6,8 @@ // Make the div behave like a button .btn-group { position: relative; + display: inline-block; + .ie7-inline-block(); font-size: 0; // remove as part 1 of font-size inline-block hack 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) @@ -22,10 +24,6 @@ font-size: 0; // Hack to remove whitespace that results from using inline-block margin-top: @baseLineHeight / 2; margin-bottom: @baseLineHeight / 2; - .btn-group { - display: inline-block; - .ie7-inline-block(); - } .btn + .btn, .btn-group + .btn, .btn + .btn-group { |