diff options
| author | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
| commit | 122245fe87bbd293a82ffa6b9c37d8b174b3dc0f (patch) | |
| tree | 35679d94b5787a2ffaf712caa0fab3bf47dd8fa3 /less/button-groups.less | |
| parent | 0fcaca86b57bf3a4fa2c8f709e90499c92e0db73 (diff) | |
| parent | 55f6beb4278979155549e17da6e87a2548ec0b88 (diff) | |
| download | bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.tar.xz bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.zip | |
Merge branch 'master' into pr/11676
Conflicts:
less/modals.less
Diffstat (limited to 'less/button-groups.less')
| -rw-r--r-- | less/button-groups.less | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index 05fda149a..794839d62 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -37,18 +37,17 @@ // Optional: Group multiple button groups together for a toolbar .btn-toolbar { - .clearfix(); + margin-left: -5px; // Offset the first child's margin + &:extend(.clearfix all); - .btn-group { + .btn-group, + .input-group { float: left; } - // Space out series of button groups > .btn, - > .btn-group { - + .btn, - + .btn-group { - margin-left: 5px; - } + > .btn-group, + > .input-group { + margin-left: 5px; } } @@ -157,7 +156,7 @@ // Clear floats so dropdown menus can be properly placed > .btn-group { - .clearfix(); + &:extend(.clearfix all); > .btn { float: none; } |