add badge-color-alt var for pick-best-color()

diff --git a/scss/components/_badge.scss b/scss/components/_badge.scss
index d5a4d45e78822318987bb617ba1f726eadcf307d..6c34d10bf0527e092478ab55884a53a5b610baef 100644 (file)
--- a/scss/components/_badge.scss
+++ b/scss/components/_badge.scss
@@ -12,7 +12,11 @@ $badge-background: $primary-color !default;
 
 /// Default text color for badges.
 /// @type Color
-$badge-color: pick-best-color($badge-background) !default;
+$badge-color: $white !default;
+
+/// Default text color for badges.
+/// @type Color
+$badge-color-alt: $black !default;
 
 /// Default padding inside badges.
 /// @type Number
@@ -49,7 +53,7 @@ $badge-font-size: 0.6rem !default;
       @if $name != primary {
         &.#{$name} {
           background: $color;
-          color: pick-best-color($color, ($white, $black));
+          color: pick-best-color($color, ($badge-color, $badge-color-alt));
         }
       }
     }

diff --git a/scss/settings/_settings.scss b/scss/settings/_settings.scss
index 2628657150176a9df87edd58b14171208fdfb917..e30ec36a6f6474fa3e77d87ab3b444ad62e4fdef 100644 (file)
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@ -215,7 +215,8 @@ $accordionmenu-arrow-color: $primary-color;
 // --------
 
 $badge-background: $primary-color;
-$badge-color: pick-best-color($badge-background);
+$badge-color: $white;
+$badge-color-alt: $black;
 $badge-padding: 0.3em;
 $badge-minwidth: 2.1em;
 $badge-font-size: 0.6rem;