diff options
| author | Mark Otto <[email protected]> | 2012-07-07 12:34:47 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-07 12:34:47 -0700 |
| commit | e2b777d9a3ea12ec10f6046975ec0f43c6636601 (patch) | |
| tree | fbc42561598b6d8fd37d92405c56ea056a9b1a26 | |
| parent | 7cc916d1378847d9e6e353d553f6d73aeab386d2 (diff) | |
| download | bootstrap-e2b777d9a3ea12ec10f6046975ec0f43c6636601.tar.xz bootstrap-e2b777d9a3ea12ec10f6046975ec0f43c6636601.zip | |
docs pre font-size and nowrap on prepend/append
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 1 | ||||
| -rw-r--r-- | less/forms.less | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f19508441..babfe6351 100644 --- 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 6ad151181..2fd1715af 100644 --- 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 1b57b66be..b53159a1e 100644 --- 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 { |