diff options
| author | Mark Otto <[email protected]> | 2014-03-31 21:12:38 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-31 21:12:38 -0700 |
| commit | 47a3c6d60b5348ac68f5a0b6d6e6e7f490844cee (patch) | |
| tree | 8dc50e14660ae2c8a84c07d24f09d51582f3ea90 /docs | |
| parent | 680be24cd94f1a753bad4565961dfd4703085c35 (diff) | |
| parent | 11ffc7346b9a26735fe857e9b0794a5c609c1b7b (diff) | |
| download | bootstrap-47a3c6d60b5348ac68f5a0b6d6e6e7f490844cee.tar.xz bootstrap-47a3c6d60b5348ac68f5a0b6d6e6e7f490844cee.zip | |
Merge pull request #13241 from twbs/address-13240
explicitly doc that icon classes should only be used on empty elements
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/components/glyphicons.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html index 6900e0dfa..0f932f45c 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><span></code> and apply the icon classes to the <code><span></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 %} |