From: Andy Cochran <acochran@council.nyc.gov>
Date: Wed, 2 Nov 2016 20:41:41 +0000 (-0400)
Subject: add badge-color-alt var for pick-best-color()
X-Git-Tag: v6.3-rc1~6^2~4^2~2^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf45095741e9cf54d8583a6eaa31314ee4629c09;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

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

diff --git a/scss/components/_badge.scss b/scss/components/_badge.scss
index d5a4d45e7..6c34d10bf 100644
--- 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 262865715..e30ec36a6 100644
--- 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;