diff options
| author | Mark Otto <[email protected]> | 2013-12-18 11:41:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 11:41:48 -0800 |
| commit | 6315043b1c11c6391f155e0c7299783a13cfee74 (patch) | |
| tree | 3ba859890c893630a5b4098642d37fb0fb19b7d4 /less/input-groups.less | |
| parent | b93d6dfbdf1f01e5e89764d846e1f68828c61c02 (diff) | |
| parent | d15218a09ce68d0854d0aa5f5170c1ea859aee31 (diff) | |
| download | bootstrap-6315043b1c11c6391f155e0c7299783a13cfee74.tar.xz bootstrap-6315043b1c11c6391f155e0c7299783a13cfee74.zip | |
Merge branch 'master' into docs_derp
Diffstat (limited to 'less/input-groups.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; + } } } |