From 4f6eb0663463c2c1bec5ca8622cc5fc950239218 Mon Sep 17 00:00:00 2001
From: lassekongo83 <lassekongo83@users.noreply.github.com>
Date: Sun, 31 May 2020 19:51:53 +0200
Subject: [PATCH] Various tweaks and fixes

---
 gtk/src/Zukitre/gtk-3.0/_common.scss | 20 ++++++++++----------
 gtk/src/Zukitre/gtk-3.0/_custom.scss | 11 +++++++++++
 gtk/src/Zukitre/gtk-3.0/gtk-dark.css |  4 ----
 gtk/src/Zukitre/gtk-3.0/gtk.css      | 10 ++++++----
 gtk/src/Zukitwo/gtk-3.0/_common.scss | 22 +++++++++++-----------
 gtk/src/Zukitwo/gtk-3.0/_custom.scss | 11 +++++++++++
 gtk/src/Zukitwo/gtk-3.0/gtk-dark.css |  6 +-----
 gtk/src/Zukitwo/gtk-3.0/gtk.css      | 12 +++++++-----
 8 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/gtk/src/Zukitre/gtk-3.0/_common.scss b/gtk/src/Zukitre/gtk-3.0/_common.scss
index c1af614..d9a45b3 100644
--- a/gtk/src/Zukitre/gtk-3.0/_common.scss
+++ b/gtk/src/Zukitre/gtk-3.0/_common.scss
@@ -1575,16 +1575,16 @@ headerbar {
   }
 
   // Darken switchbuttons for headerbars. issue #1588
-  stackswitcher button:checked,
-  button.toggle:checked {
-
-    background: if($variant == 'light', image(darken($bg_color, 17%)), image(darken($bg_color, 9%)));
-    border-color: darken($borders_color, 3%);
-    border-top-color: darken($borders_color, 8%);
-    &:backdrop {
-      @include button(backdrop-active);
-    }
-  }
+  //stackswitcher button:checked,
+  //button.toggle:checked {
+
+  //  background: if($variant == 'light', image(darken($bg_color, 17%)), image(darken($bg_color, 9%)));
+  //  border-color: darken($borders_color, 3%);
+  //  border-top-color: darken($borders_color, 8%);
+  //  &:backdrop {
+  //    @include button(backdrop-active);
+  //  }
+  //}
 
   .selection-mode &,
   &.selection-mode {
diff --git a/gtk/src/Zukitre/gtk-3.0/_custom.scss b/gtk/src/Zukitre/gtk-3.0/_custom.scss
index 51857ab..ba02561 100644
--- a/gtk/src/Zukitre/gtk-3.0/_custom.scss
+++ b/gtk/src/Zukitre/gtk-3.0/_custom.scss
@@ -233,6 +233,17 @@ $_button_border_color: darken($alt_headerbar_bg, 10%) !global;
   }
 
   image { color: transparent; }
+
+  row:selected & {
+    @if $variant == 'light' {
+      box-shadow: none;
+      border: 1px solid $checkradio_borders_color;
+
+      &:backdrop { border-color: $checkradio_borders_color; }
+
+      > slider { &:checked, & { border-color: $checkradio_borders_color; } }
+    }
+  }
 }
 
 //-------------------//
diff --git a/gtk/src/Zukitre/gtk-3.0/gtk-dark.css b/gtk/src/Zukitre/gtk-3.0/gtk-dark.css
index daae6d8..18c993d 100644
--- a/gtk/src/Zukitre/gtk-3.0/gtk-dark.css
+++ b/gtk/src/Zukitre/gtk-3.0/gtk-dark.css
@@ -557,10 +557,6 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; padding-left: 12px; padding-right: 12px; }
 
-.titlebar:not(headerbar) stackswitcher button:checked, .titlebar:not(headerbar) button.toggle:checked, headerbar stackswitcher button:checked, headerbar button.toggle:checked { background: image(#151718); border-color: #1a1c1d; border-top-color: #0e0f10; }
-
-.titlebar:not(headerbar) stackswitcher button:checked:backdrop, .titlebar:not(headerbar) button.toggle:checked:backdrop, headerbar stackswitcher button:checked:backdrop, headerbar button.toggle:checked:backdrop { color: #b9babb; border-color: #232627; background-image: image(#232627); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-
 .selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode headerbar, headerbar.selection-mode { color: #ffffff; border-color: #1c345c; text-shadow: 0 -1px rgba(0, 0, 0, 0.5); border-color: rgba(33, 36, 37, 0.7); background: #4a79c7; box-shadow: inset 0 1px rgba(117, 152, 211, 0.75), inset 0 -1px rgba(246, 246, 247, 0); }
 
 .selection-mode .titlebar:backdrop:not(headerbar), .selection-mode.titlebar:backdrop:not(headerbar), .selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { background-color: #4a79c7; background-image: none; box-shadow: inset 0 1px rgba(131, 163, 215, 0.7); }
diff --git a/gtk/src/Zukitre/gtk-3.0/gtk.css b/gtk/src/Zukitre/gtk-3.0/gtk.css
index 94c8c72..fc0ba03 100644
--- a/gtk/src/Zukitre/gtk-3.0/gtk.css
+++ b/gtk/src/Zukitre/gtk-3.0/gtk.css
@@ -565,10 +565,6 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; padding-left: 12px; padding-right: 12px; }
 
-.titlebar:not(headerbar) stackswitcher button:checked, .titlebar:not(headerbar) button.toggle:checked, headerbar stackswitcher button:checked, headerbar button.toggle:checked { background: image(#ababab); border-color: #a8a8a8; border-top-color: #9b9b9b; }
-
-.titlebar:not(headerbar) stackswitcher button:checked:backdrop, .titlebar:not(headerbar) button.toggle:checked:backdrop, headerbar stackswitcher button:checked:backdrop, headerbar button.toggle:checked:backdrop { color: #5f5f5f; border-color: #b7b7b7; background-image: image(#c7c7c7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-
 .selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode headerbar, headerbar.selection-mode { color: #ffffff; border-color: #2e5596; text-shadow: 0 -1px rgba(0, 0, 0, 0.5); background: #4a79c7; box-shadow: inset 0 1px #a5bce3, inset 0 -1px rgba(255, 255, 255, 0.3); }
 
 .selection-mode .titlebar:backdrop:not(headerbar), .selection-mode.titlebar:backdrop:not(headerbar), .selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { background-color: #4a79c7; background-image: none; box-shadow: inset 0 1px #b7c9e9; }
@@ -1834,6 +1830,12 @@ switch:checked > slider { background-color: white; }
 
 switch image { color: transparent; }
 
+row:selected switch { box-shadow: none; border: 1px solid #284a83; }
+
+row:selected switch:backdrop { border-color: #284a83; }
+
+row:selected switch > slider:checked, row:selected switch > slider { border-color: #284a83; }
+
 scrollbar.vertical button.up { -gtk-icon-source: -gtk-scaled(url("assets/scrollarrow-up.png"), url("assets/scrollarrow-up@2.png")); }
 
 scrollbar.vertical button.down { -gtk-icon-source: -gtk-scaled(url("assets/scrollarrow-down.png"), url("assets/scrollarrow-down@2.png")); }
diff --git a/gtk/src/Zukitwo/gtk-3.0/_common.scss b/gtk/src/Zukitwo/gtk-3.0/_common.scss
index bbbe39f..cc963e1 100644
--- a/gtk/src/Zukitwo/gtk-3.0/_common.scss
+++ b/gtk/src/Zukitwo/gtk-3.0/_common.scss
@@ -1463,7 +1463,7 @@ combobox {
   -GtkWidget-window-dragging: true;
   padding: 4px;
   background-color: if($variant=='light', $dark_fill, darken($base_color, 4%));
-  box-shadow: inset 0 2px transparentize($borders_color, 0.65);
+  box-shadow: inset 0 1px transparentize($borders_color, 0.65);
 }
 
 toolbar {
@@ -1575,16 +1575,16 @@ headerbar {
   }
 
   // Darken switchbuttons for headerbars. issue #1588
-  stackswitcher button:checked,
-  button.toggle:checked {
-
-    background: if($variant == 'light', image(darken($bg_color, 17%)), image(darken($bg_color, 9%)));
-    border-color: darken($borders_color, 3%);
-    border-top-color: darken($borders_color, 8%);
-    &:backdrop {
-      @include button(backdrop-active);
-    }
-  }
+  //stackswitcher button:checked,
+  //button.toggle:checked {
+
+  //  background: if($variant == 'light', image(darken($bg_color, 17%)), image(darken($bg_color, 9%)));
+  //  border-color: darken($borders_color, 3%);
+  //  border-top-color: darken($borders_color, 8%);
+  //  &:backdrop {
+  //    @include button(backdrop-active);
+  //  }
+  //}
 
   .selection-mode &,
   &.selection-mode {
diff --git a/gtk/src/Zukitwo/gtk-3.0/_custom.scss b/gtk/src/Zukitwo/gtk-3.0/_custom.scss
index 43d19e7..f73aef4 100644
--- a/gtk/src/Zukitwo/gtk-3.0/_custom.scss
+++ b/gtk/src/Zukitwo/gtk-3.0/_custom.scss
@@ -200,6 +200,17 @@ $_button_border_color: darken($alt_headerbar_bg, 10%) !global;
   }
 
   image { color: transparent; }
+
+  row:selected & {
+    @if $variant == 'light' {
+      box-shadow: none;
+      border: 1px solid $checkradio_borders_color;
+
+      &:backdrop { border-color: $checkradio_borders_color; }
+
+      > slider { &:checked, & { border-color: $checkradio_borders_color; } }
+    }
+  }
 }
 
 //-------------------//
diff --git a/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css b/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css
index 6693c2f..9bc2d00 100644
--- a/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css
+++ b/gtk/src/Zukitwo/gtk-3.0/gtk-dark.css
@@ -525,7 +525,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
 
 combobox:drop(active) { box-shadow: none; }
 
-toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #2e3132; box-shadow: inset 0 2px rgba(33, 36, 37, 0.35); }
+toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #2e3132; box-shadow: inset 0 1px rgba(33, 36, 37, 0.35); }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -557,10 +557,6 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; padding-left: 12px; padding-right: 12px; }
 
-.titlebar:not(headerbar) stackswitcher button:checked, .titlebar:not(headerbar) button.toggle:checked, headerbar stackswitcher button:checked, headerbar button.toggle:checked { background: image(#151718); border-color: #1a1c1d; border-top-color: #0e0f10; }
-
-.titlebar:not(headerbar) stackswitcher button:checked:backdrop, .titlebar:not(headerbar) button.toggle:checked:backdrop, headerbar stackswitcher button:checked:backdrop, headerbar button.toggle:checked:backdrop { color: #b9babb; border-color: #232627; background-image: image(#232627); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-
 .selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode headerbar, headerbar.selection-mode { color: #ffffff; border-color: #1c345c; text-shadow: 0 -1px rgba(0, 0, 0, 0.5); border-color: rgba(33, 36, 37, 0.7); background: #4a79c7; background-image: linear-gradient(to bottom, #618ace, #4a79c7); box-shadow: inset 0 1px rgba(117, 152, 211, 0.75), inset 0 -1px rgba(246, 246, 247, 0); }
 
 .selection-mode .titlebar:backdrop:not(headerbar), .selection-mode.titlebar:backdrop:not(headerbar), .selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { background-color: #4a79c7; background-image: none; box-shadow: inset 0 1px rgba(131, 163, 215, 0.7); }
diff --git a/gtk/src/Zukitwo/gtk-3.0/gtk.css b/gtk/src/Zukitwo/gtk-3.0/gtk.css
index 6addc8e..0324896 100644
--- a/gtk/src/Zukitwo/gtk-3.0/gtk.css
+++ b/gtk/src/Zukitwo/gtk-3.0/gtk.css
@@ -533,7 +533,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
 
 combobox:drop(active) { box-shadow: none; }
 
-toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #c3c3c3; box-shadow: inset 0 2px rgba(176, 176, 176, 0.35); }
+toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #c3c3c3; box-shadow: inset 0 1px rgba(176, 176, 176, 0.35); }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -565,10 +565,6 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; padding-left: 12px; padding-right: 12px; }
 
-.titlebar:not(headerbar) stackswitcher button:checked, .titlebar:not(headerbar) button.toggle:checked, headerbar stackswitcher button:checked, headerbar button.toggle:checked { background: image(#ababab); border-color: #a8a8a8; border-top-color: #9b9b9b; }
-
-.titlebar:not(headerbar) stackswitcher button:checked:backdrop, .titlebar:not(headerbar) button.toggle:checked:backdrop, headerbar stackswitcher button:checked:backdrop, headerbar button.toggle:checked:backdrop { color: #5f5f5f; border-color: #b7b7b7; background-image: image(#c7c7c7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-
 .selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode headerbar, headerbar.selection-mode { color: #ffffff; border-color: #2e5596; text-shadow: 0 -1px rgba(0, 0, 0, 0.5); background: #4a79c7; background-image: linear-gradient(to bottom, #618ace, #4a79c7); box-shadow: inset 0 1px #a5bce3, inset 0 -1px rgba(255, 255, 255, 0.3); }
 
 .selection-mode .titlebar:backdrop:not(headerbar), .selection-mode.titlebar:backdrop:not(headerbar), .selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { background-color: #4a79c7; background-image: none; box-shadow: inset 0 1px #b7c9e9; }
@@ -1830,6 +1826,12 @@ switch:checked > slider { background-color: white; }
 
 switch image { color: transparent; }
 
+row:selected switch { box-shadow: none; border: 1px solid #284a83; }
+
+row:selected switch:backdrop { border-color: #284a83; }
+
+row:selected switch > slider:checked, row:selected switch > slider { border-color: #284a83; }
+
 scrollbar.vertical button.up { -gtk-icon-source: -gtk-scaled(url("assets/scrollarrow-up.png"), url("assets/scrollarrow-up@2.png")); }
 
 scrollbar.vertical button.down { -gtk-icon-source: -gtk-scaled(url("assets/scrollarrow-down.png"), url("assets/scrollarrow-down@2.png")); }