Fixes #5853: Maintain 10px margin above help block when following input groups

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 50453131c255cb988d9886e13bb0216bcb5c6396..732724f137b028e1121c6d8ea65579bd21834e0a 100644 (file)
--- 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 1e1a04bdfbf6447e48c1c0587fd580c8c6269696..2dff2291914d62d80057fdfa161793b580fedfcc 100644 (file)
--- 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;
     }