diff options
| author | Mark Otto <[email protected]> | 2013-05-11 12:25:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-11 12:25:46 -0700 |
| commit | 184018837b07c216d8667003ac0bd9958eb07cee (patch) | |
| tree | d36d5d748edf27986990926b3a3570a0f5c53b67 | |
| parent | 8051695c87d7420862307090ac49ca2d1e74b40b (diff) | |
| parent | 60c24ddd976f24ac773c27d091a5a2559f54d2b0 (diff) | |
| download | bootstrap-184018837b07c216d8667003ac0bd9958eb07cee.tar.xz bootstrap-184018837b07c216d8667003ac0bd9958eb07cee.zip | |
Merge pull request #7851 from blakeembrey/input-group-btn-radius
[v3] Fix the selectors for the .input-group-btn class
| -rw-r--r-- | docs/assets/css/bootstrap.css | 10 | ||||
| -rw-r--r-- | less/forms.less | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5484d9833..7e47655b5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1637,8 +1637,9 @@ select:focus:invalid:focus { .input-group input:first-child, .input-group-addon:first-child, -.input-group-btn:first-child > .btn:first-child, -.input-group-btn:first-child > .dropdown-toggle:first-child { +.input-group-btn:first-child > .btn, +.input-group-btn:first-child > .dropdown-toggle, +.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { border-top-right-radius: 0; border-bottom-right-radius: 0; } @@ -1649,8 +1650,9 @@ select:focus:invalid:focus { .input-group input:last-child, .input-group-addon:last-child, -.input-group-btn:last-child > .btn:last-child, -.input-group-btn:last-child > .dropdown-toggle { +.input-group-btn:last-child > .btn, +.input-group-btn:last-child > .dropdown-toggle, +.input-group-btn:first-child > .btn:not(:first-child) { border-bottom-left-radius: 0; border-top-left-radius: 0; } diff --git a/less/forms.less b/less/forms.less index cc69e935f..173520000 100644 --- a/less/forms.less +++ b/less/forms.less @@ -410,8 +410,9 @@ select:focus:invalid { // Reset rounded corners .input-group input:first-child, .input-group-addon:first-child, -.input-group-btn:first-child > .btn:first-child, -.input-group-btn:first-child > .dropdown-toggle:first-child { +.input-group-btn:first-child > .btn, +.input-group-btn:first-child > .dropdown-toggle, +.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { .border-right-radius(0); } .input-group-addon:first-child { @@ -419,8 +420,9 @@ select:focus:invalid { } .input-group input:last-child, .input-group-addon:last-child, -.input-group-btn:last-child > .btn:last-child, -.input-group-btn:last-child > .dropdown-toggle { +.input-group-btn:last-child > .btn, +.input-group-btn:last-child > .dropdown-toggle, +.input-group-btn:first-child > .btn:not(:first-child) { .border-left-radius(0); } .input-group-addon:last-child { |