diff options
| author | Mark Otto <[email protected]> | 2013-12-17 22:49:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-17 22:49:55 -0800 |
| commit | 91fdd891000b1110c7585aab1156a3edea718567 (patch) | |
| tree | b6dda4499e66d4a0fcfb3854021f61e492e710a9 /less | |
| parent | 36e3311b3ef180db0e0aaf0c540c55e607cc5994 (diff) | |
| parent | ae640d4f1cea3b12fcfbf2d6c8d5bb3c29c9aadf (diff) | |
| download | bootstrap-91fdd891000b1110c7585aab1156a3edea718567.tar.xz bootstrap-91fdd891000b1110c7585aab1156a3edea718567.zip | |
Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn
Fix handling of .btn-group placed inside .input-group-btn
Diffstat (limited to 'less')
| -rw-r--r-- | less/input-groups.less | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/less/input-groups.less b/less/input-groups.less index de1e68903..b486cf4d2 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -95,8 +95,10 @@ .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, +.input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, -.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { +.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), +.input-group-btn:last-child > .btn-group:not(:last-child) > .btn { .border-right-radius(0); } .input-group-addon:first-child { @@ -105,8 +107,10 @@ .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, +.input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, -.input-group-btn:first-child > .btn:not(:first-child) { +.input-group-btn:first-child > .btn:not(:first-child), +.input-group-btn:first-child > .btn-group:not(:first-child) > .btn { .border-left-radius(0); } .input-group-addon:last-child { @@ -138,10 +142,16 @@ } // Negative margin to only have a 1px border between the two - &:first-child > .btn { - margin-right: -1px; + &:first-child { + > .btn, + > .btn-group { + margin-right: -1px; + } } - &:last-child > .btn { - margin-left: -1px; + &:last-child { + > .btn, + > .btn-group { + margin-left: -1px; + } } } |