aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Kwiatkowski <[email protected]>2013-04-19 21:31:55 +0200
committerArtur Kwiatkowski <[email protected]>2013-04-19 21:31:55 +0200
commit39bb8146f863474eee6c7daa946ea07f6ce2aa04 (patch)
tree2dab6a21d3684c5bafc9c39211973271274aa716
parent61ea1ae9092780bc673e6caa88dcf8483b458c8e (diff)
downloadbootstrap-39bb8146f863474eee6c7daa946ea07f6ce2aa04.tar.xz
bootstrap-39bb8146f863474eee6c7daa946ea07f6ce2aa04.zip
more nested labels component
-rw-r--r--docs/assets/css/bootstrap.css1
-rw-r--r--less/labels.less100
2 files changed, 77 insertions, 24 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b9809980c..5e5c7d44d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4784,6 +4784,7 @@ a.thumbnail:focus {
}
.label {
+ display: inline;
padding: .25em .6em;
font-size: 75%;
font-weight: 500;
diff --git a/less/labels.less b/less/labels.less
index 436fd6ace..87e2cdf74 100644
--- a/less/labels.less
+++ b/less/labels.less
@@ -2,9 +2,10 @@
// Labels
// --------------------------------------------------
+// LESS base
-// Base classes
-.label {
+.label() {
+ display: inline;
padding: .25em .6em;
font-size: 75%;
font-weight: 500;
@@ -15,32 +16,83 @@
text-align: center;
background-color: @grayLight;
border-radius: .25em;
-}
-// Hover state, but only for links
-a.label {
- &:hover,
- &:focus {
- color: #fff;
- text-decoration: none;
- cursor: pointer;
+ //hover state, but only for links - as a mixin which will be accessible as LESS shorthand: .label > .a;
+ .a() {
+ &:hover,
+ &:focus {
+ color: #fff;
+ text-decoration: none;
+ cursor: pointer;
+ }
+ }
+
+ // Colors
+ // Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
+ // Constructed as parametric mixin so it wont overproduce [href] by default - only for elements that will have arg link passed to local .is mixin
+
+ .label-danger() {
+ background-color: @label-danger-bg;
+ .is(@arg) when (@arg = link) {
+ &[href] {
+ background-color: darken(@label-danger-bg, 10%);
+ }
+ }
+ }
+
+ .label-warning() {
+ background-color: @label-warning-bg;
+ .is(@arg) when (@arg = link) {
+ &[href] {
+ background-color: darken(@label-warning-bg, 10%);
+ }
+ }
+ }
+
+ .label-success() {
+ background-color: @label-success-bg;
+ .is(@arg) when (@arg = link) {
+ &[href] {
+ background-color: darken(@label-success-bg, 10%);
+ }
+ }
+ }
+
+ .label-info() {
+ background-color: @label-info-bg;
+ .is(@arg) when (@arg = link) {
+ &[href] {
+ background-color: darken(@label-info-bg, 10%);
+ }
+ }
}
}
-// Colors
-// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
+// populate mixins for CSS
.label {
- // Danger (red)
- &-danger { background-color: @label-danger-bg; }
- &-danger[href] { background-color: darken(@label-danger-bg, 10%); }
- // Warnings (orange)
- &-warning { background-color: @label-warning-bg; }
- &-warning[href] { background-color: darken(@label-warning-bg, 10%); }
- // Success (green)
- &-success { background-color: @label-success-bg; }
- &-success[href] { background-color: darken(@label-success-bg, 10%); }
- // Info (turquoise)
- &-info { background-color: @label-info-bg; }
- &-info[href] { background-color: darken(@label-info-bg, 10%); }
+ .label();
+}
+
+a.label {
+ .label > .a;
+}
+
+.label-danger {
+ .label > .label-danger;
+ .label > .label-danger > .is(link); // will produce .label-danger[href] class for folks who like to use class in HTML
+}
+
+.label-warning {
+ .label > .label-warning;
+ .label > .label-warning > .is(link);
+}
+
+.label-success {
+ .label > .label-success;
+ .label > .label-success > .is(link);
}
+.label-info {
+ .label > .label-info;
+ .label > .label-info > .is(link);
+} \ No newline at end of file