diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
| commit | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (patch) | |
| tree | f11fa18c33d1a65ae4422dc3c352c34a2b323b8c /less/button-groups.less | |
| parent | 41c782567775d3bbcfc62d163ae22a531277b5e2 (diff) | |
| parent | b352f98f325adbd994f01cb94f4d0a454783bbce (diff) | |
| download | bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.tar.xz bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/tests/unit/bootstrap-collapse.js
Diffstat (limited to 'less/button-groups.less')
| -rw-r--r-- | less/button-groups.less | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index 9e6eaa496..3a72d90bf 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -32,7 +32,7 @@ // Optional: Group multiple button groups together for a toolbar .btn-toolbar { - .clear_float(); + .clearfix(); .btn-group { float: left; @@ -73,6 +73,21 @@ .border-right-radius(@border-radius-large); } +// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group) +.btn-group > .btn-group { + float: left; +} +.btn-group > .btn-group > .btn { + border-radius: 0; +} +.btn-group > .btn-group:last-child > .btn { + .border-right-radius(@border-radius-base); +} +.btn-group > .btn-group:first-child > .btn { + margin-left: 0; + .border-left-radius(@border-radius-base); +} + // On active and open, don't show outline .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { |