aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-05 20:01:45 -0700
committerMark Otto <[email protected]>2013-08-05 20:01:45 -0700
commit1d1e21aff6c131be7c911e2b83febe339fa48272 (patch)
tree0355fdccf1ff8599f63a883dd4723c8d977e1e00 /less
parentac3cb6974ad0573812b65a2054a5809da9946cb6 (diff)
parent219f0fe7c54d6ece4fcfc58b140189c12e63f360 (diff)
downloadbootstrap-1d1e21aff6c131be7c911e2b83febe339fa48272.tar.xz
bootstrap-1d1e21aff6c131be7c911e2b83febe339fa48272.zip
Merge pull request #9123 from twbs/bs3_alerts_default_class
Update labels to include a base class (fixes #8752)
Diffstat (limited to 'less')
-rw-r--r--less/labels.less7
-rw-r--r--less/variables.less2
2 files changed, 7 insertions, 2 deletions
diff --git a/less/labels.less b/less/labels.less
index 7e7ea169f..eee76d297 100644
--- a/less/labels.less
+++ b/less/labels.less
@@ -12,7 +12,6 @@
text-align: center;
white-space: nowrap;
vertical-align: baseline;
- background-color: @gray-light;
border-radius: .25em;
// Add hover effects, but only for links
@@ -22,13 +21,17 @@
color: @label-link-hover-color;
text-decoration: none;
cursor: pointer;
- background-color: darken(@gray-light, 10%);
}
}
}
// Colors
// Contextual variations (linked labels get darker on :hover)
+
+.label-default {
+ .label-variant(@label-default-bg);
+}
+
.label-danger {
.label-variant(@label-danger-bg);
}
diff --git a/less/variables.less b/less/variables.less
index aaebe5bda..27b13c3ab 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -381,6 +381,8 @@
// Labels
// -------------------------
+
+@label-default-bg: @gray-light;
@label-success-bg: @brand-success;
@label-info-bg: @brand-info;
@label-warning-bg: @brand-warning;