diff options
| author | Mark Otto <[email protected]> | 2013-12-18 09:42:45 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 09:42:45 -0800 |
| commit | c1f68dd4d4bf54ed406420be45974ed831dd4437 (patch) | |
| tree | 962837947a1ab486dc9dcfa2d105017855b2da09 /less | |
| parent | 8142493b42935f70881f29ed67acf991029ebdcb (diff) | |
| parent | 671fb7020bdaa807da6be2e23b779c65cb52a4d6 (diff) | |
| download | bootstrap-c1f68dd4d4bf54ed406420be45974ed831dd4437.tar.xz bootstrap-c1f68dd4d4bf54ed406420be45974ed831dd4437.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
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; + } } } |