aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-18 16:50:26 -0700
committerMark Otto <[email protected]>2012-08-18 16:50:26 -0700
commite6e0e2ac9b0a31979531b6add3d1c8aaceb65f2e (patch)
tree38ada601028197e832bf289d9c973881b510b5ec /docs/assets/css/bootstrap.css
parent4d2f584fdd921a9b463355513a0beba5052a199b (diff)
downloadbootstrap-e6e0e2ac9b0a31979531b6add3d1c8aaceb65f2e.tar.xz
bootstrap-e6e0e2ac9b0a31979531b6add3d1c8aaceb65f2e.zip
fixes #4442: allow for .btn within a .btn-toolbar without .btn-group
Diffstat (limited to 'docs/assets/css/bootstrap.css')
-rw-r--r--docs/assets/css/bootstrap.css6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3af4a7945..82fee6dae 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3328,6 +3328,7 @@ input[type="submit"].btn.btn-mini {
.btn-toolbar {
margin-top: 10px;
margin-bottom: 10px;
+ font-size: 0;
}
.btn-toolbar .btn-group {
@@ -3338,6 +3339,11 @@ input[type="submit"].btn.btn-mini {
*zoom: 1;
}
+.btn-toolbar .btn-group + .btn,
+.btn-toolbar .btn + .btn-group {
+ margin-left: 5px;
+}
+
.btn-group > .btn {
position: relative;
margin-left: -1px;