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

4 files changed, 10 insertions, 1 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ed054dd31..6fc8725b9 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 76a58dfb1..dc20a861d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -887,6 +887,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 }
 .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 +897,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 }
 .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 +935,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   /* 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 +2380,7 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
 }
 .tab-content {
   display: table;
+  width: 100%;
 }
 .tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
   border-bottom: 0;
@@ -3175,6 +3180,7 @@ a.thumbnail:hover {
   padding: 2px 4px 3px;
   font-size: 11.049999999999999px;
   font-weight: bold;
+  white-space: nowrap;
   color: #ffffff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #999999;
@@ -3220,6 +3226,7 @@ a.thumbnail:hover {
   padding: 2px 10px 3px;
   font-size: 12.025px;
   font-weight: bold;
+  white-space: nowrap;
   color: #ffffff;
   background-color: #999999;
   -webkit-border-radius: 10px;
diff --git a/less/badges.less b/less/badges.less
index 6f74108ee..97dadcefa 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -6,6 +6,7 @@
   padding: 2px 10px 3px;
   font-size: @baseFontSize * .925;
   font-weight: bold;
+  white-space: nowrap;
   color: @white;
   background-color: @grayLight;
   .border-radius(10px);
diff --git a/less/labels.less b/less/labels.less
index ae6b00e02..8d9913470 100644
--- a/less/labels.less
+++ b/less/labels.less
@@ -6,6 +6,7 @@
   padding: 2px 4px 3px;
   font-size: @baseFontSize * .85;
   font-weight: bold;
+  white-space: nowrap;
   color: @white;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   background-color: @grayLight;