From d83b6bb9e17161d7a1e1c745730779528a1e776d Mon Sep 17 00:00:00 2001
From: Christian Medel <cmedelahumada@gmail.com>
Date: Tue, 11 Jun 2019 15:35:30 -0400
Subject: [PATCH] Sizing and color corrections

---
 gtk-3.20/gtk-widgets.css | 48 ++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/gtk-3.20/gtk-widgets.css b/gtk-3.20/gtk-widgets.css
index 28efc97..8f6304a 100644
--- a/gtk-3.20/gtk-widgets.css
+++ b/gtk-3.20/gtk-widgets.css
@@ -54,10 +54,6 @@ image, image:disabled, label, label:disabled, box, box:disabled {
 label selection {
   background-color: @theme_selected_bg_color;
   color: @theme_selected_fg_color; }
-label.separator {
-  color: @borders; }
-  label.separator:backdrop {
-    color: @unfocused_borders; }
 label.dim-label, label.separator, popover label.separator, popover.background label.separator, label:disabled {
   opacity: 0.55; }
 
@@ -819,6 +815,11 @@ button.circular, button.circular-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%; }
 
+stackswitcher button.circular, stackswitcher button.text-button.circular {
+  min-width: 32px;
+  min-height: 32px;
+  padding: 0; }
+
 printdialog paper {
   border: 1px solid @borders;
   background: @light_shadow;
@@ -1716,39 +1717,32 @@ headerbar, headerbar:not(.titlebar) {
     padding-right: 12px;
     color: alpha(currentColor, 0.7); }
   headerbar button, headerbar:not(.titlebar) button {
-    padding: 4px 8px;
-    border-style: solid;
-    border-width: 0;
+    border-color: transparent;
     border-radius: 4px;
     color: @headerbar_fg_color;
-    border-color: @borders;
-    background-color: mix(@theme_bg_color, @theme_fg_color, 0.1);
-    -gtk-outline-radius: 4px; }
+    background-color: transparent; }
+    headerbar button:hover, headerbar:not(.titlebar) button:hover {
+      border-color: @borders;
+      color: @headerbar_fg_color;
+      background-color: @headerbar_bg_color; }
     headerbar button:active, headerbar button:checked, headerbar:not(.titlebar) button:active, headerbar:not(.titlebar) button:checked {
       color: @theme_selected_fg_color;
-      border-color: @theme_selected_bg_color;
       background-color: @theme_selected_bg_color; }
       headerbar button:active:backdrop, headerbar button:checked:backdrop, headerbar:not(.titlebar) button:active:backdrop, headerbar:not(.titlebar) button:checked:backdrop {
         color: @theme_unfocused_selected_fg_color;
-        border-color: @theme_unfocused_selected_bg_color;
-        background-color: @theme_unfocused_selected_bg_color; }
-      headerbar button:active:disabled, headerbar button:checked:disabled, headerbar:not(.titlebar) button:active:disabled, headerbar:not(.titlebar) button:checked:disabled {
-        color: @theme_disabled_fg_color;
-        border-color: mix(@borders, @theme_disabled_bg_color, 0.85);
-        background-color: shade(@theme_disabled_bg_color, 0.9); }
-        headerbar button:active:disabled:backdrop, headerbar button:checked:disabled:backdrop, headerbar:not(.titlebar) button:active:disabled:backdrop, headerbar:not(.titlebar) button:checked:disabled:backdrop {
-          color: @theme_unfocused_disabled_fg_color;
-          border-color: @unfocused_borders;
-          background-color: shade(@theme_unfocused_disabled_bg_color, 0.9); }
+        background-color: shade(@theme_unfocused_selected_bg_color, 0.6); }
     headerbar button:disabled, headerbar:not(.titlebar) button:disabled {
-      color: mix(@headerbar_fg_color, @theme_unfocused_disabled_fg_color, 0.5);
-      border-color: mix(@borders, @theme_unfocused_disabled_fg_color, 0.5); }
+      border-color: transparent;
+      color: alpha(@borders, 0.8);
+      background-color: transparent; }
       headerbar button:disabled:backdrop, headerbar:not(.titlebar) button:disabled:backdrop {
-        color: @theme_unfocused_disabled_fg_color;
-        border-color: @theme_unfocused_disabled_fg_color; }
+        border-color: transparent;
+        color: alpha(@borders, 0.7);
+        background-color: transparent; }
     headerbar button:backdrop, headerbar:not(.titlebar) button:backdrop {
-      color: @theme_unfocused_fg_color;
-      border-color: @theme_unfocused_fg_color; }
+      border-color: transparent;
+      background-color: transparent;
+      color: @theme_unfocused_fg_color; }
   headerbar entry, headerbar:not(.titlebar) entry {
     padding: 4px 8px; }