From: Chris Rebert <code@rebertia.com>
Date: Mon, 31 Mar 2014 08:24:54 +0000 (-0700)
Subject: explicitly doc that icon classes should only be used on empty elements; closes #13240
X-Git-Tag: v3.2.0~287^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ffc7346b9a26735fe857e9b0794a5c609c1b7b;p=thirdparty%2Fbootstrap.git

explicitly doc that icon classes should only be used on empty elements; closes #13240
---

diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html
index 6900e0dfa4..0f932f45c7 100644
--- a/docs/_includes/components/glyphicons.html
+++ b/docs/_includes/components/glyphicons.html
@@ -21,6 +21,10 @@
     <h4>Don't mix with other components</h4>
     <p>Icon classes cannot be directly combined with other components. They should not be used along with other classes on the same element. Instead, add a nested <code>&lt;span&gt;</code> and apply the icon classes to the <code>&lt;span&gt;</code>.</p>
   </div>
+  <div class="bs-callout bs-callout-danger">
+    <h4>Only for use on empty elements</h4>
+    <p>Icon classes should only be used on elements that contain no text content and have no child elements.</p>
+  </div>
 {% highlight html %}
 <span class="glyphicon glyphicon-search"></span>
 {% endhighlight %}