diff options
| author | Mark Otto <[email protected]> | 2013-12-15 11:16:57 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 11:16:57 -0800 |
| commit | fd62247bf8bbb1bce072f5ee03e996dfc4abed94 (patch) | |
| tree | 487766325e03d40c7af16c58873b70d8638a72ba /less/button-groups.less | |
| parent | fbf31f965e27a6665c7e0f2d97eb74c0df7585d4 (diff) | |
| parent | 2b86e05a6150ef13905519070ea82ce895fbae85 (diff) | |
| download | bootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.tar.xz bootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.zip | |
Merge branch 'master' into cover_template
Diffstat (limited to 'less/button-groups.less')
| -rw-r--r-- | less/button-groups.less | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index ef9c34e77..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 { + 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; } } |