aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-19 17:07:41 -0700
committerMark Otto <[email protected]>2012-08-19 17:07:41 -0700
commitb745b7768a837a38ca47f174c62b8689e18e2733 (patch)
treecab599ef8aa000751bd85c79ada377f4a37789e6 /docs
parent887f11d47f052a0dd123f76a6ac39a955c2429d4 (diff)
downloadbootstrap-b745b7768a837a38ca47f174c62b8689e18e2733.tar.xz
bootstrap-b745b7768a837a38ca47f174c62b8689e18e2733.zip
fixes #4458: improve support for .btn + .btn in .btn-groups and .btn-toolbars
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 70f77af7e..38829e7d5 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3334,6 +3334,7 @@ input[type="submit"].btn.btn-mini {
*zoom: 1;
}
+.btn-toolbar .btn + .btn,
.btn-toolbar .btn-group + .btn,
.btn-toolbar .btn + .btn-group {
margin-left: 5px;
@@ -3341,12 +3342,15 @@ input[type="submit"].btn.btn-mini {
.btn-group > .btn {
position: relative;
- margin-left: -1px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
+.btn-group > .btn + .btn {
+ margin-left: -1px;
+}
+
.btn-group > .btn,
.btn-group > .dropdown-menu {
font-size: 14px;
@@ -3516,7 +3520,6 @@ input[type="submit"].btn.btn-mini {
display: block;
float: none;
width: 100%;
- margin-left: 0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
@@ -3524,6 +3527,7 @@ input[type="submit"].btn.btn-mini {
.btn-group-vertical .btn + .btn {
margin-top: -1px;
+ margin-left: 0;
}
.btn-group-vertical .btn:first-child {