From: Mark Otto <markotto@twitter.com>
Date: Tue, 21 Feb 2012 17:05:04 +0000 (-0800)
Subject: Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into... 
X-Git-Tag: v2.0.2~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d908731566a18a236609708238e697b4fc3c1355;p=thirdparty%2Fbootstrap.git

Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix

Conflicts:
	docs/assets/bootstrap.zip
---

d908731566a18a236609708238e697b4fc3c1355
diff --cc docs/assets/bootstrap.zip
index ed054dd31f,fe81a1fa02..6fc8725b90
Binary files differ
diff --cc docs/assets/css/bootstrap.css
index 76a58dfb12,3220216b96..dc20a861dd
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -887,6 -887,6 +887,8 @@@ input:focus:required:invalid:focus, tex
  }
  .input-prepend input,
  .input-append input,
++.input-prepend select,
++.input-append select,
  .input-prepend .uneditable-input,
  .input-append .uneditable-input {
    -webkit-border-radius: 0 3px 3px 0;
@@@ -895,6 -895,6 +897,8 @@@
  }
  .input-prepend input:focus,
  .input-append input:focus,
++.input-prepend select:focus,
++.input-append select:focus,
  .input-prepend .uneditable-input:focus,
  .input-append .uneditable-input:focus {
    position: relative;
@@@ -931,7 -931,7 +935,7 @@@
    /* IE6-7 */
  
  }
--.input-append input, .input-append .uneditable-input {
++.input-append input, .input-append select .uneditable-input {
    float: left;
    -webkit-border-radius: 3px 0 0 3px;
    -moz-border-radius: 3px 0 0 3px;
@@@ -2376,6 -2376,6 +2380,7 @@@ button.btn.btn-small, input[type="submi
  }
  .tab-content {
    display: table;
++  width: 100%;
  }
  .tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
    border-bottom: 0;