diff options
| author | Mark Otto <[email protected]> | 2012-11-29 23:39:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-29 23:39:33 -0800 |
| commit | bca3ff4ed6f42701ceae1405f518c35ec8c623be (patch) | |
| tree | b92cc1ad9d26194028944324d6cdbd9b24a56e37 | |
| parent | f087b3428c6b48ee34b8da3991fc692e04719898 (diff) | |
| download | bootstrap-bca3ff4ed6f42701ceae1405f518c35ec8c623be.tar.xz bootstrap-bca3ff4ed6f42701ceae1405f518c35ec8c623be.zip | |
Fixes #5853: Maintain 10px margin above help block when following input groups
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/forms.less | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 50453131c..732724f13 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1958,7 +1958,9 @@ legend + .control-group { .form-horizontal input + .help-block, .form-horizontal select + .help-block, .form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block { +.form-horizontal .uneditable-input + .help-block, +.form-horizontal .input-prepend + .help-block, +.form-horizontal .input-append + .help-block { margin-top: 10px; } diff --git a/less/forms.less b/less/forms.less index 1e1a04bdf..2dff22919 100644 --- a/less/forms.less +++ b/less/forms.less @@ -673,7 +673,9 @@ legend + .control-group { input, select, textarea, - .uneditable-input { + .uneditable-input, + .input-prepend, + .input-append { + .help-block { margin-top: @baseLineHeight / 2; } |