aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-19 17:06:40 -0800
committerMark Otto <[email protected]>2013-01-19 17:06:40 -0800
commitc21c3f101b334fb176b5fc4efd437b7da724e1fc (patch)
tree248b8cb9d1b5f7b8e9e7c27b9f4906bbac959dd2 /docs/assets
parent64bc5dc91f2a0770d3d563c53600a82f92f53c0f (diff)
parent67ec13a44c945c61735882ce7e78174ea9e32d74 (diff)
downloadbootstrap-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/assets')
-rw-r--r--docs/assets/css/bootstrap.css40
1 files changed, 9 insertions, 31 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 1c7bf11bb..a78ab929a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4003,60 +4003,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;
}