diff options
| author | Mark Otto <[email protected]> | 2013-11-28 11:57:12 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-28 11:57:12 -0800 |
| commit | b7b72cc8773b88d4ba23a84847e93fb9e8d3e1bb (patch) | |
| tree | d58ecfd74b18ee7f1183e3e301ec519c00494bcc /components.html | |
| parent | bff8ba2b794305842d7a712a1bf6e400b898b7c0 (diff) | |
| parent | 56f4cf0316b03af888c22c62e4ef24e437b4a370 (diff) | |
| download | bootstrap-b7b72cc8773b88d4ba23a84847e93fb9e8d3e1bb.tar.xz bootstrap-b7b72cc8773b88d4ba23a84847e93fb9e8d3e1bb.zip | |
Merge branch 'master' into pr/11614
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/components.html b/components.html index 53a788f3f..ca6ae40ec 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 %} |