aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-19 21:18:32 -0800
committerMark Otto <[email protected]>2012-12-19 21:18:32 -0800
commitc6cc1b1a1d401e30e2cb7df853461dfc78134f7f (patch)
tree244531973733adbd1a2bc14234573601e928b434 /less
parent85971ff3e80ce90573ed243055b1b0ba7685e15e (diff)
downloadbootstrap-c6cc1b1a1d401e30e2cb7df853461dfc78134f7f.tar.xz
bootstrap-c6cc1b1a1d401e30e2cb7df853461dfc78134f7f.zip
Drop .label component. Instead, just use .badge because fuck dupe code and stuff.
Diffstat (limited to 'less')
-rw-r--r--less/badges.less (renamed from less/labels-badges.less)22
-rw-r--r--less/bootstrap.less2
2 files changed, 4 insertions, 20 deletions
diff --git a/less/labels-badges.less b/less/badges.less
index 8440cc469..b8de24df1 100644
--- a/less/labels-badges.less
+++ b/less/badges.less
@@ -4,7 +4,6 @@
// Base classes
-.label,
.badge {
display: inline-block;
padding: 2px 4px;
@@ -16,29 +15,17 @@
white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
background-color: @grayLight;
-}
-// Set unique padding and border-radii
-.label {
border-radius: 3px;
-}
-.badge {
- padding-left: 9px;
- padding-right: 9px;
- border-radius: 9px;
-}
-// Empty labels/badges collapse
-.label,
-.badge {
+ // Empty labels/badges collapse
&:empty {
display: none;
}
}
// Hover state, but only for links
-a {
- &.label:hover,
- &.badge:hover {
+a.badge {
+ &:hover {
color: #fff;
text-decoration: none;
cursor: pointer;
@@ -47,7 +34,6 @@ a {
// Colors
// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
-.label,
.badge {
// Important (red)
&-danger { background-color: @state-error-text; }
@@ -68,14 +54,12 @@ a {
// Quick fix for labels/badges in buttons
.btn {
- .label,
.badge {
position: relative;
top: -1px;
}
}
.btn-mini {
- .label,
.badge {
top: 0;
}
diff --git a/less/bootstrap.less b/less/bootstrap.less
index 93773ee4e..1ed13496b 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -52,7 +52,7 @@
// Components: Misc
@import "thumbnails.less";
@import "media.less";
-@import "labels-badges.less";
+@import "badges.less";
@import "progress-bars.less";
@import "accordion.less";
@import "carousel.less";