diff options
| author | Vickash Mahabir <[email protected]> | 2013-01-18 17:35:23 -0400 |
|---|---|---|
| committer | Vickash Mahabir <[email protected]> | 2013-01-18 17:35:23 -0400 |
| commit | 665de0455cb433c9e3c3b6d6ad72318b46098650 (patch) | |
| tree | 6d942891caf5ea3f1a1b72a59c6fada56c067e28 /docs | |
| parent | f068cdeb63770182b9e954eac9cbd11bf8df5d57 (diff) | |
| download | bootstrap-665de0455cb433c9e3c3b6d6ad72318b46098650.tar.xz bootstrap-665de0455cb433c9e3c3b6d6ad72318b46098650.zip | |
Change .badge to .counter, make appearance more OSX-ish, and remove colors
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 40 | ||||
| -rw-r--r-- | docs/components.html | 47 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 47 |
3 files changed, 23 insertions, 111 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 46cd2bc4b..5c7c2bba9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3991,60 +3991,38 @@ a.thumbnail:hover { list-style: none; } -.badge { +.counter { display: inline-block; - padding: 2px 4px; + min-width: 10px; + padding: 2px 7px; font-size: 11.844px; font-weight: bold; line-height: 14px; color: #fff; + text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); white-space: nowrap; vertical-align: baseline; background-color: #999999; - border-radius: 3px; + border-radius: 10px; } -.badge:empty { +.counter:empty { display: none; } -a.badge:hover { +a.counter:hover { color: #fff; text-decoration: none; cursor: pointer; } -.badge-danger { - background-color: #b94a48; -} - -.badge-danger[href] { - background-color: #953b39; -} - -.badge-warning { - background-color: #f89406; -} - -.badge-warning[href] { - background-color: #c67605; -} - -.badge-success { - background-color: #468847; -} - -.badge-success[href] { - background-color: #356635; -} - -.btn .badge { +.btn .counter { position: relative; top: -1px; } -.btn-mini .badge { +.btn-mini .counter { top: 0; } diff --git a/docs/components.html b/docs/components.html index 76590a1ca..d432dda58 100644 --- a/docs/components.html +++ b/docs/components.html @@ -91,7 +91,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> @@ -1333,11 +1333,11 @@ - <!-- Badges + <!-- Counters ================================================== --> - <section id="badges"> + <section id="counters"> <div class="page-header"> - <h1>Badges</h1> + <h1>Counters</h1> </div> <table class="table table-bordered table-striped"> @@ -1354,50 +1354,17 @@ Default </td> <td> - <span class="badge">1</span> + <span class="counter">42</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> + <code><span class="counter">42</span></code> </td> </tr> </tbody> </table> <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> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 0172ada8a..63f8c765b 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -22,7 +22,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> @@ -1264,11 +1264,11 @@ - <!-- Badges + <!-- Counters ================================================== --> - <section id="badges"> + <section id="counters"> <div class="page-header"> - <h1>Badges</h1> + <h1>Counters</h1> </div> <table class="table table-bordered table-striped"> @@ -1285,50 +1285,17 @@ Default </td> <td> - <span class="badge">1</span> + <span class="counter">42</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> + <code><span class="counter">42</span></code> </td> </tr> </tbody> </table> <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> |
