From aee69615bc4e9f48e60b876c04a36c8e17c3bcae Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 25 Mar 2016 22:43:57 -0400
Subject: [PATCH] HighContrastInverse: Fix suggested-action colors

Choose a suitable foreground color instead of hardcoding white.

https://bugzilla.gnome.org/show_bug.cgi?id=764170
---
 gtk/theme/HighContrast/_common.scss            | 18 +++++++++---------
 .../HighContrast/gtk-contained-inverse.css     |  8 ++++----
 gtk/theme/HighContrast/gtk-contained.css       |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index e08ec7e869..8a367b2699 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -555,10 +555,10 @@ button {
   }
 
   // Suggested and Destructive Action buttons
-  @each $b_type, $b_color in (suggested-action, $selected_bg_color),
-                             (destructive-action, $destructive_color) {
+  @each $b_type, $b_color, $f_color in (suggested-action, $selected_bg_color, $selected_fg_color),
+                             (destructive-action, $destructive_color, white) {
     &.#{$b_type} {
-      @include button(normal, $b_color, white);
+      @include button(normal, $b_color, $f_color);
 
       &.flat {
         @include button(undecorated);
@@ -566,23 +566,23 @@ button {
         color: $b_color; //FIXME: does it work on the dark variant?
       }
 
-      &:hover { @include button(hover, $b_color, white); }
+      &:hover { @include button(hover, $b_color, $f_color); }
 
       &:active,
-      &:checked { @include button(active, $b_color, white); }
+      &:checked { @include button(active, $b_color, $f_color); }
 
       &:backdrop,
       &.flat:backdrop {
-        @include button(backdrop, $b_color, white);
+        @include button(backdrop, $b_color, $f_color);
 
         &:active,
-        &:checked { @include button(backdrop-active, $b_color, white); }
+        &:checked { @include button(backdrop-active, $b_color, $f_color); }
 
         &:disabled {
           @include button(backdrop-insensitive);
 
           &:active,
-          &:checked { @include button(backdrop-insensitive-active, $b_color, white); }
+          &:checked { @include button(backdrop-insensitive-active, $b_color, $f_color); }
         }
       }
 
@@ -598,7 +598,7 @@ button {
         @include button(insensitive);
 
         &:active,
-        &:checked { @include button(insensitive-active, $b_color, white); }
+        &:checked { @include button(insensitive-active, $b_color, $f_color); }
       }
 
       .osd & {
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 83dc0ccead..4aef8db638 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -600,7 +600,7 @@ popover.background.touch-selection button, popover.background.magnifier button,
 button.suggested-action {
   border-width: 2px;
   border-style: solid;
-  color: white;
+  color: #000;
   background-image: none;
   background-color: #ddd;
   border-color: #9d9d9d; }
@@ -615,7 +615,7 @@ button.suggested-action {
   button.suggested-action:hover {
     border-width: 2px;
     border-style: solid;
-    color: white;
+    color: #000;
     background-color: #ddd;
     border-color: #9d9d9d;
     background-image: none; }
@@ -623,13 +623,13 @@ button.suggested-action {
     border-width: 2px;
     border-style: solid;
     background-image: none;
-    color: black;
+    color: white;
     background-color: #222222;
     border-color: #9d9d9d; }
   button.suggested-action:backdrop, button.suggested-action.flat:backdrop {
     border-width: 2px;
     border-style: solid;
-    color: white;
+    color: #000;
     background-color: #ddd;
     border-color: #ddd;
     background-image: none; }
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 86af6bca51..15c2b6c7ac 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -602,7 +602,7 @@ popover.background.touch-selection button, popover.background.magnifier button,
 button.suggested-action {
   border-width: 2px;
   border-style: solid;
-  color: white;
+  color: #fff;
   background-image: none;
   background-color: #000;
   border-color: black; }
@@ -617,7 +617,7 @@ button.suggested-action {
   button.suggested-action:hover {
     border-width: 2px;
     border-style: solid;
-    color: white;
+    color: #fff;
     background-color: #000;
     border-color: black;
     background-image: none; }
@@ -631,7 +631,7 @@ button.suggested-action {
   button.suggested-action:backdrop, button.suggested-action.flat:backdrop {
     border-width: 2px;
     border-style: solid;
-    color: white;
+    color: #fff;
     background-color: #000;
     border-color: #000;
     background-image: none; }