From: Mark Otto <otto@github.com>
Date: Thu, 28 Nov 2013 19:38:28 +0000 (-0800)
Subject: Fixes #11634: Add warning to docs to not combine icon classes with other elements
X-Git-Tag: v3.0.3~16^2~11^2~19^2~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56f4cf0316b03af888c22c62e4ef24e437b4a370;p=thirdparty%2Fbootstrap.git

Fixes #11634: Add warning to docs to not combine icon classes with other elements
---

diff --git a/components.html b/components.html
index 53a788f3fa..ca6ae40ec7 100644
--- a/components.html
+++ b/components.html
@@ -822,6 +822,10 @@ base_url: "../"
 
     <h2 id="glyphicons-how-to-use">How to use</h2>
     <p>For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.</p>
+    <div class="bs-callout bs-callout-danger">
+      <h4>Don't mix with other components</h4>
+      <p>Icon classes cannot be combined with other elements. They are designed to be standalone elements.</p>
+    </div>
 {% highlight html %}
 <span class="glyphicon glyphicon-search"></span>
 {% endhighlight %}