mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 19:31:35 +02:00
Code Issues Releases Wiki Activity

Merge pull request #7851 from blakeembrey/input-group-btn-radius

Browse Source 
[v3] Fix the selectors for the .input-group-btn class
This commit is contained in:
Mark Otto
2013-05-11 12:25:46 -07:00
parent 8051695c87 60c24ddd97
commit 184018837b
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/assets/css/bootstrap.css vendored
View File

@@ -1637,8 +1637,9 @@ select:focus:invalid:focus {
.input-group input:first-child, .input-group input:first-child,
.input-group-addon:first-child, .input-group-addon:first-child,
.input-group-btn:first-child > .btn:first-child, .input-group-btn:first-child > .btn,
.input-group-btn:first-child > .dropdown-toggle:first-child { .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-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
@@ -1649,8 +1650,9 @@ select:focus:invalid:focus {
.input-group input:last-child, .input-group input:last-child,
.input-group-addon:last-child, .input-group-addon:last-child,
.input-group-btn:last-child > .btn:last-child, .input-group-btn:last-child > .btn,
.input-group-btn:last-child > .dropdown-toggle { .input-group-btn:last-child > .dropdown-toggle,
.input-group-btn:first-child > .btn:not(:first-child) {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
} }

10
less/forms.less
View File

@@ -410,8 +410,9 @@ select:focus:invalid {
// Reset rounded corners // Reset rounded corners
.input-group input:first-child, .input-group input:first-child,
.input-group-addon:first-child, .input-group-addon:first-child,
.input-group-btn:first-child > .btn:first-child, .input-group-btn:first-child > .btn,
.input-group-btn:first-child > .dropdown-toggle:first-child { .input-group-btn:first-child > .dropdown-toggle,
.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
.border-right-radius(0); .border-right-radius(0);
} }
.input-group-addon:first-child { .input-group-addon:first-child {
@@ -419,8 +420,9 @@ select:focus:invalid {
} }
.input-group input:last-child, .input-group input:last-child,
.input-group-addon:last-child, .input-group-addon:last-child,
.input-group-btn:last-child > .btn:last-child, .input-group-btn:last-child > .btn,
.input-group-btn:last-child > .dropdown-toggle { .input-group-btn:last-child > .dropdown-toggle,
.input-group-btn:first-child > .btn:not(:first-child) {
.border-left-radius(0); .border-left-radius(0);
} }
.input-group-addon:last-child { .input-group-addon:last-child {