diff options
| author | Mark Otto <[email protected]> | 2012-11-29 23:32:38 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-29 23:32:38 -0800 |
| commit | fe7b6decb17786c2cd1ce80205d06ad7a3f8ba0e (patch) | |
| tree | 840c9dad3663d19fbfd8e718927e4edcab7aeeea | |
| parent | 322a56354fdc576492769c631cb7af51edcb7a68 (diff) | |
| parent | ddd154481bc9341668f236ca071c936803e43f7a (diff) | |
| download | bootstrap-fe7b6decb17786c2cd1ce80205d06ad7a3f8ba0e.tar.xz bootstrap-fe7b6decb17786c2cd1ce80205d06ad7a3f8ba0e.zip | |
Merge pull request #6039 from desheikh/2.2.2-wip
help-block margin-top should also apply after a span.uneditable-input
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | less/forms.less | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e6003ee14..79a7a1520 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1957,7 +1957,8 @@ legend + .control-group { .form-horizontal input + .help-block, .form-horizontal select + .help-block, -.form-horizontal textarea + .help-block { +.form-horizontal textarea + .help-block, +.form-horizontal span.uneditable-input + .help-block { margin-top: 10px; } diff --git a/less/forms.less b/less/forms.less index 172ed027d..4e7617365 100644 --- a/less/forms.less +++ b/less/forms.less @@ -672,7 +672,8 @@ legend + .control-group { // And apply it only to .help-block instances that follow a form control input, select, - textarea { + textarea, + span.uneditable-input { + .help-block { margin-top: @baseLineHeight / 2; } |