diff options
| author | Mark Otto <[email protected]> | 2012-11-28 01:51:04 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-28 01:51:04 -0800 |
| commit | 783120dffaab396955b0ad237bf3a82a73a6e1dc (patch) | |
| tree | f0a6df3ca26c68f1c1b3375d166d243c009329ac | |
| parent | 014d3cedf5f92e9b9f246cef2c639b2845e6741f (diff) | |
| download | bootstrap-783120dffaab396955b0ad237bf3a82a73a6e1dc.tar.xz bootstrap-783120dffaab396955b0ad237bf3a82a73a6e1dc.zip | |
Fixes #5927: Scope button group 5px button left margin to immediate children
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 | ||||
| -rw-r--r-- | less/button-groups.less | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9c343dc17..b25535eb6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3573,9 +3573,9 @@ input[type="submit"].btn.btn-mini { font-size: 0; } -.btn-toolbar .btn + .btn, -.btn-toolbar .btn-group + .btn, -.btn-toolbar .btn + .btn-group { +.btn-toolbar > .btn + .btn, +.btn-toolbar > .btn-group + .btn, +.btn-toolbar > .btn + .btn-group { margin-left: 5px; } diff --git a/less/button-groups.less b/less/button-groups.less index 002a3ff07..2963c75de 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -24,9 +24,9 @@ font-size: 0; // Hack to remove whitespace that results from using inline-block margin-top: @baseLineHeight / 2; margin-bottom: @baseLineHeight / 2; - .btn + .btn, - .btn-group + .btn, - .btn + .btn-group { + > .btn + .btn, + > .btn-group + .btn, + > .btn + .btn-group { margin-left: 5px; } } |