diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:03:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:03:21 -0800 |
| commit | 544b8ecab78c322bf826797374c0b10279cedf1f (patch) | |
| tree | 865e70cb34492198265e6770e343406ed8811a98 /less/button-groups.less | |
| parent | fd4130534f6453bbe9c306cfd0869ee6599394b1 (diff) | |
| download | bootstrap-544b8ecab78c322bf826797374c0b10279cedf1f.tar.xz bootstrap-544b8ecab78c322bf826797374c0b10279cedf1f.zip | |
Fixes #10921: Add support for input groups within button toolbars
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`
See it in action: http://jsbin.com/aGEcUqAT/1/.
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; } } |