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

Conflicts:
	docs/assets/bootstrap.zip

diff --cc docs/assets/bootstrap.zip
index ed054dd31faf2b31c3b56b9e0b48fa0468ea9c78,fe81a1fa02747401bfb25f6340c2d1553e0d6beb..6fc8725b909fb50e4d4a0eb5c243dbe5138168e0
Binary files differ

diff --cc docs/assets/css/bootstrap.css
index 76a58dfb12334b8a4ee8015faa3246640f8db53f,3220216b96cc53595d453dbd861c622512541457..dc20a861dd8be6205743423bb21bae752a46b684
--- 1/docs/assets/css/bootstrap.css
--- 2/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;