root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 14 Packages Projects Releases Wiki Activity

clarify docs regarding non-mixable components

This commit is contained in:
Chris Rebert 2014-01-14 21:26:19 -08:00
parent 5ead87d519
commit 9ebd8d39a9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/components.html
View File

@ -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>&lt;span&gt;</code> and apply the icon classes to the <code>&lt;span&gt;</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-info">
<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>

4
docs/css.html
View File

@ -1580,6 +1580,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<button type="submit" class="btn btn-default">Submit</button>
</form>
{% endhighlight %}
<div class="bs-callout bs-callout-warning">
<h4>Don't mix form groups with input groups</h4>
<p>Do not mix form groups directly with <a href="/components/#input-groups">input groups</a>. Instead, nest the input group inside of the form group.</p>
</div>
<h2 id="forms-inline">Inline form</h2>