From faacbdb49f31fc0cda07f2ebc3e28cd1e1e3690d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 12 Aug 2015 22:12:40 -0700
Subject: [PATCH] Remove .help-block entirely

- Fixes #13267 somewhat.
- Instead of a single, block-level class, let's use a combination of existing elements and classes.
- For block-level help text, use p.text-muted.
- For inline-level help text, use span.text-muted or small.text-muted.
---
 docs/components/forms.md |  7 ++++---
 scss/_forms.scss         | 13 -------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/docs/components/forms.md b/docs/components/forms.md
index bfb24bd28f..5763adaab5 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -22,6 +22,7 @@ Remember, since Bootstrap utilizes the HTML5 doctype, **all inputs must have a `
   <fieldset class="form-group">
     <label for="exampleInputEmail1">Email address</label>
     <input type="email" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
+    <small class="text-muted">We'll never share your email with anyone else.</small>
   </fieldset>
   <fieldset class="form-group">
     <label for="exampleInputPassword1">Password</label>
@@ -54,7 +55,7 @@ Remember, since Bootstrap utilizes the HTML5 doctype, **all inputs must have a `
   <fieldset class="form-group">
     <label for="exampleInputFile">File input</label>
     <input type="file" class="form-control-file" id="exampleInputFile">
-    <p class="help-block">This is some placeholder block-level help text for the above input. It's a bit lighter and easily wraps to a new line.</p>
+    <small class="text-muted">This is some placeholder block-level help text for the above input. It's a bit lighter and easily wraps to a new line.</small>
   </fieldset>
   <div class="radio">
     <label>
@@ -517,12 +518,12 @@ Wrap inputs in grid columns, or any custom parent element, to easily enforce des
 Block level help text for form controls.
 
 {% example html %}
-<p class="help-block">A block of help text that breaks onto a new line and may extend beyond one line.</p>
+<p class="text-help">A block of help text that breaks onto a new line and may extend beyond one line.</p>
 {% endexample %}
 
 ## Validation
 
-Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-error`, or `.has-success` to the parent element. Any `.control-label`, `.form-control`, and `.help-block` within that element will receive the validation styles.
+Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-error`, or `.has-success` to the parent element. Any `.control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles.
 
 {% comment %}
 {% callout warning %}
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 5266419fde..32c63f75cd 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -385,19 +385,6 @@ $form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGl
 // }
 
 
-// Help text
-//
-// Apply to any element you wish to create light text for placement immediately
-// below a form control. Use for general help, formatting, or instructional text.
-
-.help-block {
-  display: block; // account for any element using help-block
-  margin-top: .25rem;
-  margin-bottom: .75rem;
-  color: lighten($body-color, 25%); // lighten the text some for contrast
-}
-
-
 // Inline forms
 //
 // Make forms appear inline(-block) by adding the `.form-inline` class. Inline