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 /dist/css/bootstrap.css | |
| 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 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 436e8e6a0..10c025bc9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3045,13 +3045,16 @@ input[type="button"].btn-block { .btn-group .btn-group + .btn-group { margin-left: -1px; } -.btn-toolbar .btn-group { +.btn-toolbar { + margin-left: -5px; +} +.btn-toolbar .btn-group, +.btn-toolbar .input-group { float: left; } -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group, -.btn-toolbar > .btn-group + .btn-group { +.btn-toolbar > .btn, +.btn-toolbar > .btn-group, +.btn-toolbar > .input-group { margin-left: 5px; } .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { |