From: Mark Otto <otto@github.com>
Date: Fri, 30 Nov 2012 07:39:33 +0000 (-0800)
Subject: Fixes #5853: Maintain 10px margin above help block when following input groups
X-Git-Tag: v2.2.2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bca3ff4ed6f42701ceae1405f518c35ec8c623be;p=thirdparty%2Fbootstrap.git

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 50453131c2..732724f137 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 1e1a04bdfb..2dff229191 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;
     }