From cc16a6ca6cb2654adb66e7808368c0b1dedcc989 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Wed, 8 Oct 2014 17:47:15 +0200
Subject: [PATCH] Adwaita: color button changes

Dimmed inner colorswatch shadow to make brighter colors looks nice,
increased the padding to make button states more evident, 0 border
radius to match the padding change and no colorswatch shadows when
the button is insensitive.
---
 gtk/resources/theme/Adwaita/_common.scss           |  7 ++++---
 gtk/resources/theme/Adwaita/gtk-contained-dark.css | 10 ++++++----
 gtk/resources/theme/Adwaita/gtk-contained.css      | 10 ++++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index ddc2459393..b14490cef7 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -797,11 +797,12 @@ $_dot_color: if($variant=='light', $selected_bg_color,
 }
 
 GtkColorButton.button {
-  padding: 4px; // Uniform padding on the GtkColorButton
+  padding: 5px; // Uniform padding on the GtkColorButton
   GtkColorSwatch {
-    border-radius: 1.5px;
-    box-shadow: inset 0 1px 1px transparentize(black, 0.8),
+    border-radius: 0;
+    box-shadow: inset 0 1px 1px transparentize(black, 0.9),
                 _widget_edge();
+    &:insensitive,
     &:backdrop { box-shadow: none; }
   }
 }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 8086ba4fe5..519c9d0a6d 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1289,13 +1289,15 @@ GtkCalendar.header .menuitem.titlebutton.button {
 GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
 .titlebar GtkColorButton.button.titlebutton,
 GtkCalendar.header GtkColorButton.button.titlebutton {
-  padding: 4px; }
+  padding: 5px; }
   GtkColorButton.button GtkColorSwatch, .header-bar GtkColorButton.button.titlebutton GtkColorSwatch,
   .titlebar GtkColorButton.button.titlebutton GtkColorSwatch,
   GtkCalendar.header GtkColorButton.button.titlebutton GtkColorSwatch {
-    border-radius: 1.5px;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2), 0 1px rgba(238, 238, 236, 0.1); }
-    GtkColorButton.button GtkColorSwatch:backdrop, .header-bar GtkColorButton.button.titlebutton GtkColorSwatch:backdrop,
+    border-radius: 0;
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+    GtkColorButton.button GtkColorSwatch:insensitive, .header-bar GtkColorButton.button.titlebutton GtkColorSwatch:insensitive,
+    .titlebar GtkColorButton.button.titlebutton GtkColorSwatch:insensitive,
+    GtkCalendar.header GtkColorButton.button.titlebutton GtkColorSwatch:insensitive, GtkColorButton.button GtkColorSwatch:backdrop, .header-bar GtkColorButton.button.titlebutton GtkColorSwatch:backdrop,
     .titlebar GtkColorButton.button.titlebutton GtkColorSwatch:backdrop,
     GtkCalendar.header GtkColorButton.button.titlebutton GtkColorSwatch:backdrop {
       box-shadow: none; }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index ad0bf1e07f..b3f9399e69 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1281,13 +1281,15 @@ GtkCalendar.header .menuitem.titlebutton.button {
 GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
 .titlebar GtkColorButton.button.titlebutton,
 GtkCalendar.header GtkColorButton.button.titlebutton {
-  padding: 4px; }
+  padding: 5px; }
   GtkColorButton.button GtkColorSwatch, .header-bar GtkColorButton.button.titlebutton GtkColorSwatch,
   .titlebar GtkColorButton.button.titlebutton GtkColorSwatch,
   GtkCalendar.header GtkColorButton.button.titlebutton GtkColorSwatch {
-    border-radius: 1.5px;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2), 0 1px white; }
-    GtkColorButton.button GtkColorSwatch:backdrop, .header-bar GtkColorButton.button.titlebutton GtkColorSwatch:backdrop,
+    border-radius: 0;
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
+    GtkColorButton.button GtkColorSwatch:insensitive, .header-bar GtkColorButton.button.titlebutton GtkColorSwatch:insensitive,
+    .titlebar GtkColorButton.button.titlebutton GtkColorSwatch:insensitive,
+    GtkCalendar.header GtkColorButton.button.titlebutton GtkColorSwatch:insensitive, GtkColorButton.button GtkColorSwatch:backdrop, .header-bar GtkColorButton.button.titlebutton GtkColorSwatch:backdrop,
     .titlebar GtkColorButton.button.titlebutton GtkColorSwatch:backdrop,
     GtkCalendar.header GtkColorButton.button.titlebutton GtkColorSwatch:backdrop {
       box-shadow: none; }