From: Mark Otto <markdotto@gmail.com>
Date: Thu, 4 Feb 2016 04:43:12 +0000 (-0800)
Subject: Dump the type margin overrides in alerts for utils, document that particular example... 
X-Git-Tag: v4.0.0-alpha.3~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4a2b993958c61becd96f4adff505a245ab0be44;p=thirdparty%2Fbootstrap.git

Dump the type margin overrides in alerts for utils, document that particular example, sidesteps part of #18884
---

diff --git a/docs/components/alerts.md b/docs/components/alerts.md
index e27109768d..c269c3d8f2 100644
--- a/docs/components/alerts.md
+++ b/docs/components/alerts.md
@@ -49,6 +49,19 @@ Use the `.alert-link` utility class to quickly provide matching colored links wi
 </div>
 {% endexample %}
 
+### Additional content
+
+Alerts can also contain additional HTML elements like headings and paragraphs.
+
+{% example html %}
+<div class="alert alert-success" role="alert">
+  <h4 class="alert-heading">Well done!</h4>
+  <p>Aww yeah, you successfully read this important alert message. This example text is going to run a bit longer so that you can see how spacing within an alert works with this kind of content.</p>
+  <p class="m-b-0">Whenever you need to, be sure to use a margin utilities to keep things nice and tidy.</p>
+</div>
+{% endexample %}
+
+
 ### Dismissing
 
 Using the alert JavaScript plugin, it's possible to dismiss any alert inline. Here's how:
diff --git a/scss/_alert.scss b/scss/_alert.scss
index b3dcf03210..55fc101dc2 100644
--- a/scss/_alert.scss
+++ b/scss/_alert.scss
@@ -7,15 +7,6 @@
   margin-bottom: $spacer-y;
   border: $alert-border-width solid transparent;
   @include border-radius($alert-border-radius);
-
-  // Improve alignment and spacing of inner content
-  > p,
-  > ul {
-    margin-bottom: 0;
-  }
-  > p + p {
-    margin-top: 5px;
-  }
 }
 
 // Headings for larger alerts