From 298974b9dada0791ef5506120fa0536736e9ceb8 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Tue, 21 Oct 2014 16:34:42 +0200
Subject: [PATCH] Adwaita: colorswatch on selected elements style fix

---
 gtk/resources/theme/Adwaita/_common.scss           | 10 +++++++++-
 gtk/resources/theme/Adwaita/gtk-contained-dark.css |  4 ++++
 gtk/resources/theme/Adwaita/gtk-contained.css      |  4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index eb9c5d6fd7..f58be595ee 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2902,7 +2902,6 @@ GtkColorSwatch {
   }
   // nth-child works just on the custom colors row
 
-
   // hover effect
   &:hover {
     background-image: linear-gradient(135deg, transparentize(white, 0.3),
@@ -2952,6 +2951,15 @@ GtkColorSwatch {
     &:backdrop { @include button(backdrop); }
     .overlay { @include button(undecorated); } // reset the overlay to not cover the button style underneat
   }
+
+  // take care of colorswatches on selected elements
+  :selected & {
+    box-shadow: none;
+    &.overlay {
+      border-color: $selected_fg_color;
+    }
+  }
+
 }
 
 
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 7e1d72c4e8..fe9f13a6f5 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -4312,6 +4312,10 @@ GtkColorSwatch {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
       text-shadow: none;
       icon-shadow: none; }
+  :selected GtkColorSwatch {
+    box-shadow: none; }
+    :selected GtkColorSwatch.overlay {
+      border-color: #ffffff; }
 
 /********
  * Misc *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 9c5c811b7f..b40196d9b5 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -4473,6 +4473,10 @@ GtkColorSwatch {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       icon-shadow: none; }
+  :selected GtkColorSwatch {
+    box-shadow: none; }
+    :selected GtkColorSwatch.overlay {
+      border-color: #ffffff; }
 
 /********
  * Misc *