diff options
| author | Mark Otto <[email protected]> | 2012-12-19 21:29:57 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-19 21:29:57 -0800 |
| commit | 2011a0d50f717c95b706e10ac5e9e0f964c972a9 (patch) | |
| tree | d5cb22b75938dc38d9708045291463425cbcc596 /docs/components.html | |
| parent | c6cc1b1a1d401e30e2cb7df853461dfc78134f7f (diff) | |
| download | bootstrap-2011a0d50f717c95b706e10ac5e9e0f964c972a9.tar.xz bootstrap-2011a0d50f717c95b706e10ac5e9e0f964c972a9.zip | |
Drop labels from the docs
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 72 |
1 files changed, 6 insertions, 66 deletions
diff --git a/docs/components.html b/docs/components.html index 990f31ae6..873bff63d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -90,7 +90,7 @@ <li><a href="#navbar"><i class="glyphicon-chevron-right"></i> Navbar</a></li> <li><a href="#breadcrumbs"><i class="glyphicon-chevron-right"></i> Breadcrumbs</a></li> <li><a href="#pagination"><i class="glyphicon-chevron-right"></i> Pagination</a></li> - <li><a href="#labels-badges"><i class="glyphicon-chevron-right"></i> Labels and badges</a></li> + <li><a href="#badges"><i class="glyphicon-chevron-right"></i> Badges</a></li> <li><a href="#typography"><i class="glyphicon-chevron-right"></i> Typography</a></li> <li><a href="#thumbnails"><i class="glyphicon-chevron-right"></i> Thumbnails</a></li> <li><a href="#alerts"><i class="glyphicon-chevron-right"></i> Alerts</a></li> @@ -327,7 +327,7 @@ <p>Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View <a href="./javascript.html#buttons">the JavaScript docs</a> for that.</p> <h4>Dropdowns in button groups</h4> - <p><span class="label label-info">Heads up!</span> Buttons with dropdowns must be individually wrapped in their own <code>.btn-group</code> within a <code>.btn-toolbar</code> for proper rendering.</p> + <p>Buttons with dropdowns must be individually wrapped in their own <code>.btn-group</code> within a <code>.btn-toolbar</code> for proper rendering.</p> </section> @@ -1511,73 +1511,13 @@ - <!-- Labels and badges + <!-- Badges ================================================== --> - <section id="labels-badges"> + <section id="badges"> <div class="page-header"> - <h1>Labels and badges</h1> + <h1>Badges</h1> </div> - <h3>Labels</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th>Labels</th> - <th>Markup</th> - </tr> - </thead> - <tbody> - <tr> - <td> - <span class="label">Default</span> - </td> - <td> - <code><span class="label">Default</span></code> - </td> - </tr> - <tr> - <td> - <span class="label label-success">Success</span> - </td> - <td> - <code><span class="label label-success">Success</span></code> - </td> - </tr> - <tr> - <td> - <span class="label label-warning">Warning</span> - </td> - <td> - <code><span class="label label-warning">Warning</span></code> - </td> - </tr> - <tr> - <td> - <span class="label label-danger">Danger</span> - </td> - <td> - <code><span class="label label-danger">Danger</span></code> - </td> - </tr> - <tr> - <td> - <span class="label label-info">Info</span> - </td> - <td> - <code><span class="label label-info">Info</span></code> - </td> - </tr> - <tr> - <td> - <span class="label label-inverse">Inverse</span> - </td> - <td> - <code><span class="label label-inverse">Inverse</span></code> - </td> - </tr> - </tbody> - </table> - <h3>Badges</h3> <table class="table table-bordered table-striped"> <thead> <tr> @@ -1657,7 +1597,7 @@ </table> <h3>Easily collapsible</h3> - <p>For easy implementation, labels and badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.</p> + <p>For easy implementation, badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.</p> </section> |