diff options
| author | Mark Otto <[email protected]> | 2013-01-19 17:06:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-19 17:06:40 -0800 |
| commit | c21c3f101b334fb176b5fc4efd437b7da724e1fc (patch) | |
| tree | 248b8cb9d1b5f7b8e9e7c27b9f4906bbac959dd2 /docs/components.html | |
| parent | 64bc5dc91f2a0770d3d563c53600a82f92f53c0f (diff) | |
| parent | 67ec13a44c945c61735882ce7e78174ea9e32d74 (diff) | |
| download | bootstrap-c21c3f101b334fb176b5fc4efd437b7da724e1fc.tar.xz bootstrap-c21c3f101b334fb176b5fc4efd437b7da724e1fc.zip | |
Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 75 |
1 files changed, 13 insertions, 62 deletions
diff --git a/docs/components.html b/docs/components.html index 1c98fdd46..6710e8338 100644 --- a/docs/components.html +++ b/docs/components.html @@ -93,7 +93,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="#badges"><i class="glyphicon-chevron-right"></i> Badges</a></li> + <li><a href="#counters"><i class="glyphicon-chevron-right"></i> Counters</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> @@ -1335,71 +1335,22 @@ - <!-- Badges + <!-- Counters ================================================== --> - <section id="badges"> + <section id="counters"> <div class="page-header"> - <h1>Badges</h1> - </div> - - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th>Name</th> - <th>Example</th> - <th>Markup</th> - </tr> - </thead> - <tbody> - <tr> - <td> - Default - </td> - <td> - <span class="badge">1</span> - </td> - <td> - <code><span class="badge">1</span></code> - </td> - </tr> - <tr> - <td> - Success - </td> - <td> - <span class="badge badge-success">2</span> - </td> - <td> - <code><span class="badge badge-success">2</span></code> - </td> - </tr> - <tr> - <td> - Warning - </td> - <td> - <span class="badge badge-warning">4</span> - </td> - <td> - <code><span class="badge badge-warning">4</span></code> - </td> - </tr> - <tr> - <td> - Danger - </td> - <td> - <span class="badge badge-danger">6</span> - </td> - <td> - <code><span class="badge badge-danger">6</span></code> - </td> - </tr> - </tbody> - </table> + <h1>Counters</h1> + </div> + + <div class="bs-docs-example"> + <a href="#">Inbox</a> <span class="counter">42</span> + </div> +<pre class="prettyprint linenums"> +<a href="#">Inbox</a> <span class="counter">42</span> +</pre> <h3>Easily collapsible</h3> - <p>For easy implementation, badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.</p> + <p>For easy implementation, counters will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.</p> </section> |