Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters

This commit is contained in:
Mark Otto
2013-01-19 17:06:40 -08:00
5 changed files with 40 additions and 172 deletions

View File

@@ -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;
}