From: Andy Cochran <acochran@council.nyc.gov>
Date: Wed, 2 Nov 2016 19:08:46 +0000 (-0400)
Subject: bring back button-color-alt
X-Git-Tag: v6.3-rc1~6^2~4^2~2^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3b0671b5c4415106bedcf5dd6e1a595108fb8d1;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

bring back button-color-alt
---

diff --git a/scss/components/_button.scss b/scss/components/_button.scss
index a8388f832..4e222cf19 100644
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@ -28,7 +28,11 @@ $button-background-hover: scale-color($button-background, $lightness: -15%) !def
 
 /// Font color for buttons.
 /// @type List
-$button-color: pick-best-color($button-background) !default;
+$button-color: $white !default;
+
+/// Alternative font color for buttons.
+/// @type List
+$button-color-alt: $black !default;
 
 /// Border radius for buttons, defaulted to global-radius.
 /// @type Number
@@ -110,7 +114,7 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau
   $background-hover-lightness: $button-background-hover-lightness
 ) {
   @if $color == auto {
-    $color: pick-best-color($base: $background, $colors: ($white, $black));
+    $color: pick-best-color($background, ($button-color, $button-color-alt));
   }
 
   @if $background-hover == auto {
diff --git a/scss/settings/_settings.scss b/scss/settings/_settings.scss
index 509067711..a7195a385 100644
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@ -240,7 +240,8 @@ $button-margin: 0 0 $global-margin 0;
 $button-fill: solid;
 $button-background: $primary-color;
 $button-background-hover: scale-color($button-background, $lightness: -15%);
-$button-color: pick-best-color($button-background);
+$button-color: $white;
+$button-color-alt: $black;
 $button-radius: $global-radius;
 $button-sizes: (
   tiny: 0.6rem,