[gtk+] HC: custom color button fixes

[Jakub Steiner <jimmac src gnome org>]

commit 230c248326ee7b4a144f27026434052a645008a7
Author: Jakub Steiner <jimmac gmail com>
Date:   Fri Jul 31 15:42:34 2015 +0200

    HC: custom color button fixes
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753051

 gtk/theme/HighContrast/_common.scss |   14 +++++++++++---
 gtk/theme/HighContrast/gtk.css      |   14 +++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 11a7bec..f97cbe4 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -2433,12 +2433,20 @@ GtkColorSwatch {
 
   // make the add color button looks like, well, a button
   &#add-color-button {
+    @include button(normal);
     border-style: solid; // the borders are drawn by the overlay for standard colorswatches to have them semi
     border-width: 1px;   // translucent on the colored background, here it's not necessary so they need to 
be set
-    @include button(normal);
+    box-shadow: none;
     &:hover { @include button(hover); }
-    &:backdrop { @include button(backdrop); }
-    .overlay { @include button(undecorated); } // reset the overlay to not cover the button style underneat
+    &:backdrop { 
+      @include button(backdrop); 
+      border-width: 1px;
+      color: $insensitive_fg_color; 
+    }
+    .overlay { 
+      @include button(undecorated);
+      border-width: 0; } // reset the overlay to not 
+                         // cover the button style underneat
   }
 }
 
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index a6989e9..0b7435d 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -2678,14 +2678,15 @@ GtkColorSwatch {
     GtkColorSwatch.overlay:hover, GtkColorSwatch.overlay:selected:hover {
       border-color: black; }
   GtkColorSwatch#add-color-button {
-    border-style: solid;
-    border-width: 1px;
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: #7f7f7f;
+    border-style: solid;
+    border-width: 1px;
+    box-shadow: none; }
     GtkColorSwatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
@@ -2701,10 +2702,13 @@ GtkColorSwatch {
       border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      border-width: 1px;
+      color: #7f7f7f; }
     GtkColorSwatch#add-color-button .overlay {
       border-width: 2px;
-      border-style: solid; }
+      border-style: solid;
+      border-width: 0; }
 
 /**********************
  * Window Decorations *