From f6ec2c5dac371b0b1d56abd65be548ee5ed075c8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 21:06:20 -0800 Subject: Drop the recently added .counter class for .badge --- less/badges.less | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ less/bootstrap.less | 2 +- less/counters.less | 58 ----------------------------------------------------- 3 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 less/badges.less delete mode 100644 less/counters.less (limited to 'less') diff --git a/less/badges.less b/less/badges.less new file mode 100644 index 000000000..4f1e71eda --- /dev/null +++ b/less/badges.less @@ -0,0 +1,58 @@ +// +// Badges +// -------------------------------------------------- + + +// Base classes +.badge { + display: inline-block; + min-width: 10px; + padding: 3px 7px; + font-size: 12px; + font-weight: bold; + color: #fff; + line-height: 1; + vertical-align: middle; + white-space: nowrap; + text-align: center; + background-color: @grayLight; + border-radius: 10px; + + // Empty labels/badges collapse + &:empty { + display: none; + } +} + +// Hover state, but only for links +a.badge { + &:hover, + &:focus { + color: #fff; + text-decoration: none; + cursor: pointer; + } +} + +// Quick fix for labels/badges in buttons +.btn { + .badge { + position: relative; + top: -1px; + } +} +.btn-mini { + .badge { + top: 0; + } +} + +// Account for counters in navs +.nav-list > .active > a > .badge, +.nav-pills > .active > a > .badge { + color: @link-color; + background-color: #fff; +} +.nav-pills > li > a > .badge { + margin-left: 3px; +} diff --git a/less/bootstrap.less b/less/bootstrap.less index 0a4dd9ca5..d40984230 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -49,7 +49,7 @@ @import "alerts.less"; @import "thumbnails.less"; @import "media.less"; -@import "counters.less"; +@import "badges.less"; @import "progress-bars.less"; @import "accordion.less"; @import "carousel.less"; diff --git a/less/counters.less b/less/counters.less deleted file mode 100644 index e4e44ab79..000000000 --- a/less/counters.less +++ /dev/null @@ -1,58 +0,0 @@ -// -// Labels and badges -// -------------------------------------------------- - - -// Base classes -.counter { - display: inline-block; - min-width: 10px; - padding: 3px 7px; - font-size: 12px; - font-weight: bold; - color: #fff; - line-height: 1; - vertical-align: middle; - white-space: nowrap; - text-align: center; - background-color: @grayLight; - border-radius: 10px; - - // Empty labels/badges collapse - &:empty { - display: none; - } -} - -// Hover state, but only for links -a.counter { - &:hover, - &:focus { - color: #fff; - text-decoration: none; - cursor: pointer; - } -} - -// Quick fix for labels/badges in buttons -.btn { - .counter { - position: relative; - top: -1px; - } -} -.btn-mini { - .counter { - top: 0; - } -} - -// Account for counters in navs -.nav-list > .active > a > .counter, -.nav-pills > .active > a > .counter { - color: @link-color; - background-color: #fff; -} -.nav-pills > li > a > .counter { - margin-left: 3px; -} -- cgit v1.2.3