From: Mark Otto <otto@github.com>
Date: Mon, 5 Nov 2012 03:59:07 +0000 (-0800)
Subject: Merge branch '2.2.2-wip' into exploratory
X-Git-Tag: v3.0.0-rc1~890
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee93541421e41f3a9589f9c945ef4a6614f48b4b;p=thirdparty%2Fbootstrap.git

Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	less/buttons.less
	less/forms.less
---

ee93541421e41f3a9589f9c945ef4a6614f48b4b
diff --cc docs/assets/css/bootstrap.css
index 61b2b03a7e,49e63bd315..84715df6fd
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -1449,11 -1595,12 +1450,11 @@@ select:focus:invalid 
    border-color: #ee5f5b;
  }
  
- input:focus:required:invalid:focus,
- textarea:focus:required:invalid:focus,
- select:focus:required:invalid:focus {
+ input:focus:invalid:focus,
+ textarea:focus:invalid:focus,
+ select:focus:invalid:focus {
    border-color: #e9322d;
    -webkit-box-shadow: 0 0 6px #f8b9b7;
 -     -moz-box-shadow: 0 0 6px #f8b9b7;
            box-shadow: 0 0 6px #f8b9b7;
  }
  
@@@ -1561,9 -1703,13 +1562,11 @@@
  .input-append .add-on,
  .input-prepend .add-on,
  .input-append .btn,
- .input-prepend .btn {
+ .input-prepend .btn,
+ .input-append .btn-group > .dropdown-toggle,
+ .input-prepend .btn-group > .dropdown-toggle {
    vertical-align: top;
 -  -webkit-border-radius: 0;
 -     -moz-border-radius: 0;
 -          border-radius: 0;
 +  border-radius: 0;
  }
  
  .input-append .active,
@@@ -1585,13 -1733,17 +1588,16 @@@
  .input-append input,
  .input-append select,
  .input-append .uneditable-input {
 -  -webkit-border-radius: 4px 0 0 4px;
 -     -moz-border-radius: 4px 0 0 4px;
 -          border-radius: 4px 0 0 4px;
 +  border-radius: 4px 0 0 4px;
  }
  
 +.input-append input + .btn-group .btn,
 +.input-append select + .btn-group .btn,
- .input-append .uneditable-input + .btn-group .btn {
++.input-append .uneditable-input + .btn-group .btn,
+ .input-append input + .btn-group .btn:last-child,
+ .input-append select + .btn-group .btn:last-child,
+ .input-append .uneditable-input + .btn-group .btn:last-child {
 -  -webkit-border-radius: 0 4px 4px 0;
 -     -moz-border-radius: 0 4px 4px 0;
 -          border-radius: 0 4px 4px 0;
 +  border-radius: 0 4px 4px 0;
  }
  
  .input-append .add-on,
@@@ -1601,8 -1753,11 +1607,9 @@@
  }
  
  .input-append .add-on:last-child,
- .input-append .btn:last-child {
+ .input-append .btn:last-child,
+ .input-append .btn-group:last-child > .dropdown-toggle {
 -  -webkit-border-radius: 0 4px 4px 0;
 -     -moz-border-radius: 0 4px 4px 0;
 -          border-radius: 0 4px 4px 0;
 +  border-radius: 0 4px 4px 0;
  }
  
  .input-prepend.input-append input,
@@@ -2798,7 -3031,11 +2805,8 @@@ table th[class*="span"]
  }
  
  .typeahead {
+   z-index: 1051;
    margin-top: 2px;
 -  -webkit-border-radius: 4px;
 -     -moz-border-radius: 4px;
 -          border-radius: 4px;
  }
  
  .well {
diff --cc less/dropdowns.less
index f5a5462c04,90f3741e85..934709d176
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@@ -214,5 -226,7 +214,6 @@@
  // Typeahead
  // ---------
  .typeahead {
+   z-index: 1051;
    margin-top: 2px; // give it some space to breathe
 -  .border-radius(@baseBorderRadius);
  }
diff --cc less/forms.less
index 81ddb002e4,172ed027dc..33f6ded80c
--- a/less/forms.less
+++ b/less/forms.less
@@@ -489,9 -462,10 +489,10 @@@ select:focus:invalid 
      border: 1px solid #ccc;
    }
    .add-on,
-   .btn {
+   .btn,
+   .btn-group > .dropdown-toggle {
      vertical-align: top;
 -    .border-radius(0);
 +    border-radius: 0;
    }
    .active {
      background-color: lighten(@green, 30);
@@@ -515,9 -489,9 +516,10 @@@
    input,
    select,
    .uneditable-input {
 -    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
 +    border-radius: @inputBorderRadius 0 0 @inputBorderRadius;
-     + .btn-group .btn {
++    + .btn-group .btn,
+     + .btn-group .btn:last-child {
 -      .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
 +      border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
      }
    }
    .add-on,
@@@ -526,8 -500,9 +528,9 @@@
      margin-left: -1px;
    }
    .add-on:last-child,
-   .btn:last-child {
+   .btn:last-child,
+   .btn-group:last-child > .dropdown-toggle {
 -    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
 +    border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
    }
  }