From: Mark Otto <markotto@twitter.com>
Date: Mon, 13 Feb 2012 06:49:06 +0000 (-0800)
Subject: ensure help-block is block per #1937
X-Git-Tag: v2.0.2~139^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce5976fb2901ec43c132fa7d517b9e2ca6041087;p=thirdparty%2Fbootstrap.git

ensure help-block is block per #1937
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 74c406578e..8a96db55c0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 38b1719de9..e52d2f0cfd 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -832,6 +832,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   color: #999999;
 }
 .help-block {
+  display: block;
   margin-top: 5px;
   margin-bottom: 0;
   color: #999999;
diff --git a/less/forms.less b/less/forms.less
index eb98f1bcbd..81e5bb42c7 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -327,6 +327,7 @@ select:focus:required:invalid {
 // ---------
 
 .help-block {
+  display: block; // account for any element using help-block
   margin-top: 5px;
   margin-bottom: 0;
   color: @grayLight;