From: Mark Otto <markdotto@gmail.com>
Date: Tue, 20 Dec 2016 22:46:45 +0000 (-0800)
Subject: remove .mb-0 from static form controls to follow up #21270
X-Git-Tag: v4.0.0-alpha.6~311
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1cf6310f2c9ea2ff57de83fd64e7e99e0426b8f;p=thirdparty%2Fbootstrap.git

remove .mb-0 from static form controls to follow up #21270
---

diff --git a/docs/components/forms.md b/docs/components/forms.md
index 4cbf204121..4d2282d3f9 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -519,14 +519,14 @@ Should you have no text within the `<label>`, the input is positioned as you'd e
 
 ## Static controls
 
-When you need to place plain text next to a form label within a form, use the `.form-control-static` class on an element of your choice. Using an element like `<p>` with a default margin? Be sure to use a margin override (as shown below).
+When you need to place plain text next to a form label within a form, use the `.form-control-static` class on an element of your choice.
 
 {% example html %}
 <form>
   <div class="form-group row">
     <label class="col-sm-2 col-form-label">Email</label>
     <div class="col-sm-10">
-      <p class="form-control-static mb-0">email@example.com</p>
+      <p class="form-control-static">email@example.com</p>
     </div>
   </div>
   <div class="form-group row">
@@ -542,7 +542,7 @@ When you need to place plain text next to a form label within a form, use the `.
 <form class="form-inline">
   <div class="form-group">
     <label class="sr-only">Email</label>
-    <p class="form-control-static mb-0">email@example.com</p>
+    <p class="form-control-static">email@example.com</p>
   </div>
   <div class="form-group">
     <label for="inputPassword2" class="sr-only">Password</label>