aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-12 16:37:41 -0700
committerMark Otto <[email protected]>2012-09-12 16:37:41 -0700
commit15bb78ce800dc74dfd5eed98f3d256ce095ccab0 (patch)
tree605fb69870bfc2af9f55db884cdeecae4d412b10 /docs/assets
parente1deba30aa6b894aa8228cc9bfcec8490df47873 (diff)
downloadbootstrap-15bb78ce800dc74dfd5eed98f3d256ce095ccab0.tar.xz
bootstrap-15bb78ce800dc74dfd5eed98f3d256ce095ccab0.zip
fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/css/bootstrap.css11
1 files changed, 3 insertions, 8 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 {