docs pre font-size and nowrap on prepend/append

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index f19508441655e3c1147968c0cb81a256930dec20..babfe6351b8c5f2e2904de055c6308e25aae763a 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1384,6 +1384,7 @@ textarea::-webkit-input-placeholder {
 .input-append {
   margin-bottom: 5px;
   font-size: 0;
+  white-space: nowrap;
 }
 
 .input-prepend input,
@@ -5043,7 +5044,7 @@ a.badge:hover {
 
 .progress .bar {
   width: 0;
-  height: 18px;
+  height: 100%;
   font-size: 12px;
   color: #ffffff;
   text-align: center;

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 6ad151181a886f40dcc3ce032cf2f617b46d398a..2fd1715afb5433d162168728c82af97ba4659f28 100644 (file)
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -479,6 +479,7 @@ h2 + .row {
 .bs-docs-example + .prettyprint {
   margin-top: -20px;
   padding-top: 15px;
+  font-size: 12px;
 }
 
 /* Tweak examples

diff --git a/less/forms.less b/less/forms.less
index 1b57b66be4b110e56ddfa9d92da2e67e03537961..b53159a1e7e693eb456afc7f74d92244599522af 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -381,6 +381,7 @@ textarea {
 .input-append {
   margin-bottom: 5px;
   font-size: 0;
+  white-space: nowrap; // Prevent span and input from separating
   input,
   select,
   .uneditable-input {