diff options
author | Mark Otto <markdotto@gmail.com> | 2014-01-15 09:47:24 +0400 |
---|---|---|
committer | Mark Otto <markdotto@gmail.com> | 2014-01-15 09:47:24 +0400 |
commit | 1facbf6e7a32cfb1334e9c84a59c762c27f13cb5 (patch) | |
tree | 1b6340b48e7738b0d3ed02a72f83d8567e4b468e /docs/components.html | |
parent | 96031c101d64bccc47c3457f04b43b96b7f7f7b6 (diff) | |
parent | 9ebd8d39a9d5853dd66ebed9a5f17e327e99f3ac (diff) |
Merge pull request #12232 from twbs/mixing-docs
clarify docs regarding non-mixable components
Diffstat (limited to 'docs/components.html')
-rw-r--r-- | docs/components.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/components.html b/docs/components.html index a400d216dc..ec15779b13 100644 --- a/docs/components.html +++ b/docs/components.html @@ -31,7 +31,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, <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> + <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> {% highlight html %} <span class="glyphicon glyphicon-search"></span> @@ -761,7 +761,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, </div> <div class="bs-callout bs-callout-warning"> <h4>Don't mix with other components</h4> - <p>Do not mix form group or grid column classes directly with input groups.</p> + <p>Do not mix form groups or grid column classes directly with input groups. Instead, nest the input group inside of the form group or grid-related element.</p> </div> |