diff options
| author | Mark Otto <[email protected]> | 2013-11-28 15:55:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-28 15:55:17 -0800 |
| commit | b5f9cc20578fb57b2b69e10cf32bba55f9c940e4 (patch) | |
| tree | 72b6c245b35c2c6783bc43d4add6ce0e1e65b801 /components.html | |
| parent | 0da3901ed5a6d498af8b7c76b61d004a003f716b (diff) | |
| parent | 0be94180b99cec9be239124c666721e40fbfbc97 (diff) | |
| download | bootstrap-b5f9cc20578fb57b2b69e10cf32bba55f9c940e4.tar.xz bootstrap-b5f9cc20578fb57b2b69e10cf32bba55f9c940e4.zip | |
Merge branch 'master' into pr/11414
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/components.html b/components.html index 25ed9ea11..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 %} @@ -1882,8 +1886,8 @@ base_url: "../" <h2 id="nav-justified">Justified</h2> <p>Easily make tabs or pills equal widths of their parent at screens wider than 768px with <code>.nav-justified</code>. On smaller screens, the nav links are stacked.</p> <div class="bs-callout bs-callout-warning"> - <h4>WebKit and responsive justified navs</h4> - <p>Chrome and Safari both exhibit a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p> + <h4>Safari and responsive justified navs</h4> + <p>Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p> </div> <div class="bs-example"> <ul class="nav nav-tabs nav-justified"> @@ -3160,7 +3164,7 @@ body { padding-bottom: 70px; } <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> </a> <div class="media-body"> - <h4 class="media-heading">Media heading</h4> + <h4 class="media-heading">Nested media heading</h4> Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. </div> </div> |