From e1ea3c6cbf6ddcf679bc04e334a8bbf8e2068fa3 Mon Sep 17 00:00:00 2001 From: Andy Cochran Date: Wed, 2 Nov 2016 16:55:47 -0400 Subject: [PATCH] add label-color-alt var for pick-best-color() --- scss/components/_label.scss | 8 ++++++-- scss/settings/_settings.scss | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scss/components/_label.scss b/scss/components/_label.scss index fde0ab922..b849d962d 100644 --- a/scss/components/_label.scss +++ b/scss/components/_label.scss @@ -12,7 +12,11 @@ $label-background: $primary-color !default; /// Default text color for labels. /// @type Color -$label-color: pick-best-color($label-background) !default; +$label-color: $white !default; + +/// Alternate text color for labels. +/// @type Color +$label-color-alt: $black !default; /// Default font size for labels. /// @type Number @@ -50,7 +54,7 @@ $label-radius: $global-radius !default; @if $name != primary { &.#{$name} { background: $color; - color: pick-best-color($color, ($black, $white)); + color: pick-best-color($color, ($label-color, $label-color-alt)); } } } diff --git a/scss/settings/_settings.scss b/scss/settings/_settings.scss index e30ec36a6..cc451ccde 100644 --- a/scss/settings/_settings.scss +++ b/scss/settings/_settings.scss @@ -372,7 +372,8 @@ $form-button-radius: $global-radius; // --------- $label-background: $primary-color; -$label-color: pick-best-color($label-background); +$label-color: $white; +$label-color-alt: $black; $label-font-size: 0.8rem; $label-padding: 0.33333rem 0.5rem; $label-radius: $global-radius; -- 2.47.2