From 0b25ab18d1f3be06802edf024bcb8e968563c303 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Sun, 4 Apr 2021 19:03:10 +0800
Subject: [PATCH] update

---
 src/main/gtk-3.0/gtk-dark-solid.css  | 24 ++++++++++++++++++++++++
 src/main/gtk-3.0/gtk-dark.css        | 24 ++++++++++++++++++++++++
 src/main/gtk-3.0/gtk-light-solid.css | 24 ++++++++++++++++++++++++
 src/main/gtk-3.0/gtk-light.css       | 24 ++++++++++++++++++++++++
 src/sass/gtk/_applications.scss      | 21 +++++++++++++++++++++
 src/sass/gtk/_common.scss            |  7 +++++--
 6 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index 42bbbb4..d55d601 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -1938,6 +1938,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2438,6 +2444,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5169,6 +5176,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6372,6 +6387,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6382,6 +6401,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index f3703aa..b29c84e 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -1938,6 +1938,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #FDFDFD;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2438,6 +2444,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5164,6 +5171,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6367,6 +6382,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #373737;
+}
+
 tabbox {
   background-color: #1e1e1e;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@@ -6377,6 +6396,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #373737;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index 82fe075..aa90a8a 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -1946,6 +1946,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2446,6 +2452,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5191,6 +5198,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6395,6 +6410,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6405,6 +6424,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 7dd5efb..c3edc20 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -1946,6 +1946,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
+window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
+window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
+  color: #575757;
+}
+
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2446,6 +2452,7 @@ popover.background > scrolledwindow > viewport > list {
 
 popover > scrolledwindow > viewport > list row,
 popover.background > scrolledwindow > viewport > list row {
+  padding: 6px 12px;
   border-radius: 6px;
 }
 
@@ -5186,6 +5193,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   border: none;
 }
 
+preferencesgroup list list {
+  margin: 0 0;
+  padding: 0 0;
+  box-shadow: none;
+  background: none;
+  border: none;
+}
+
 .nautilus-canvas-item {
   border-radius: 5px;
 }
@@ -6390,6 +6405,10 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
+  border-color: #ffffff;
+}
+
 tabbox {
   background-color: #e6e6e6;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@@ -6400,6 +6419,11 @@ tabbox > tab {
   padding: 2px 10px;
   min-width: 24px;
   min-height: 24px;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab:checked {
+  border-top-color: #ffffff;
 }
 
 tabbox > tab button {
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index a7265dc..77977e1 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -388,6 +388,14 @@ preferencesgroup { // gnome 40.0 preferences window
     @extend %circular_list;
 
     row.activatable { @extend %circular_row; }
+
+    list {
+      margin: 0 0;
+      padding: 0 0;
+      box-shadow: none;
+      background: none;
+      border: none;
+    }
   }
 }
 
@@ -1872,6 +1880,14 @@ notebook.main-notebook {
 }
 
 // gnome 40.0
+window.background.csd {
+  > deck > deck > fullscreenbox > flap > box > windowhandle {
+    > headerbar.titlebar { // Gnome 40.0
+      border-color: $header_bg;
+    }
+  }
+}
+
 tabbox {
   background-color: darken($header_bg, 10%);
   box-shadow: inset 0 -1px $borders_color;
@@ -1882,6 +1898,11 @@ tabbox {
     padding: 2px 10px;
     min-width: 24px;
     min-height: 24px;
+    border-top: 1px solid $borders_color;
+
+    &:checked {
+      border-top-color: $header_bg;
+    }
 
     button {
       min-height: 20px;
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index 15ebd95..b4ff554 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -1770,7 +1770,7 @@ headerbar, .titlebar {
     transition-duration: 300ms;
   }
 
-  // &:active:hover, &:checked { color: $header_fg; }
+  &:active:hover, &:checked { color: $header_fg; }
 
   &:checked {
     @include button(header-checked);
@@ -2201,7 +2201,10 @@ popover.background {
   > scrolledwindow > viewport > list {
     margin: $container_padding;
 
-    row { border-radius: $bt_radius; }
+    row {
+      padding: 6px 12px;
+      border-radius: $bt_radius;
+    }
   }
 
   &, .csd & {