]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fix the selectors for the .input-group-btn selector. 7851/head
authorBlake Embrey <hello@blakeembrey.com>
Sat, 11 May 2013 16:38:48 +0000 (09:38 -0700)
committerBlake Embrey <hello@blakeembrey.com>
Sat, 11 May 2013 16:38:48 +0000 (09:38 -0700)
docs/assets/css/bootstrap.css
less/forms.less

index 5484d9833c468d22a4c8704a6e7638ba6656b448..7e47655b5c8f036e5777b00e26359552c76f6d77 100644 (file)
@@ -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;
 }
index cc69e935f0c6468caa888ab66bf3aa27566cb50a..17352000061718a141d45d8be78b3f41c445778f 100644 (file)
@@ -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 {