From 12c8c77912a9fc741daf5f003ff81c9075981d62 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Mon, 1 May 2023 00:57:28 +0800
Subject: [PATCH] update

---
 .../widgets-44-0/_quick-settings.scss         |  1 +
 src/sass/gtk/_common-3.0.scss                 | 26 ++++++++++++-------
 src/sass/gtk/apps/_misc.scss                  |  7 +++--
 src/sass/gtk/apps/_xfce.scss                  |  6 ++++-
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
index 8a5e7f36..2ee73400 100644
--- a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
+++ b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
@@ -88,6 +88,7 @@
     background-color: $button !important;
     padding: $base_padding $base_padding * 1.75;
     border: none !important;
+    color: $text;
 
     &:hover {
       background-color: $divider !important;
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 6bd400c3..6cf7e748 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1695,9 +1695,9 @@ menubar,
 // otherwise the background bleeds out of the menu edges
 .background.popup { background-color: transparent; }
 
-menu,
-.menu,
-.context-menu {
+// .menu,
+// .context-menu,
+menu {
   margin: $space-size; // See https://bugzilla.gnome.org/show_bug.cgi?id=591258
   padding: $space-size;
   background-color: $surface;
@@ -1780,8 +1780,8 @@ menu,
     }
 
     &.bottom {
-      margin-top: 4px * 2;
-      margin-bottom: -4px * 3;
+      margin-top: 8px;
+      margin-bottom: -12px;
       // border-top: 1px solid $divider;
       border-radius: $corner-radius;
       -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
@@ -3695,8 +3695,9 @@ colorchooser .popover.osd {
  * Window Decorations *
  **********************/
 decoration {
-  transition: $transition-shadow;
+  transition: none;
   border-radius: $window-radius;
+  border: none;
 
   @if $rimless == 'true' {
     box-shadow: $shadow-z16, 0 0 36px transparent;
@@ -3713,14 +3714,15 @@ decoration {
   }
 
   // this is used for the resize cursor area
-  margin: 8px;
+  margin: 10px;
 
   &:backdrop {
+    transition: $transition-shadow;
+
     // the transparent shadow here is to enforce that the shadow extents don't
     // change when we go to backdrop, to prevent jumping windows.
     // The biggest shadow should be in the same order then in the active state
     // or the jumping will happen during the transition.
-
     @if $rimless == 'true' {
       box-shadow: $shadow-z4, 0 0 36px transparent;
     } @else {
@@ -3728,14 +3730,18 @@ decoration {
     }
   }
 
-  .maximized &,
-  .fullscreen &,
   .tiled &,
   .tiled-top &,
   .tiled-right &,
   .tiled-bottom &,
   .tiled-left & { border-radius: 0; }
 
+  .maximized &,
+  .fullscreen & {
+    border-radius: 0;
+    box-shadow: none;
+  }
+
   .popup & {
     box-shadow: none;
     border: none;
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index 7a9dd416..3d62bee5 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -106,8 +106,11 @@ window.background.chromium {
   menubar,
   headerbar { color: $titlebar-text-secondary; }
 
-  // Workaround for non-animatable buttons in headerbar
-  headerbar button:active { background-color: $overlay-active; }
+  headerbar.titlebar {
+    padding: 0 $space-size * 2;
+
+    button:active { background-color: $overlay-active; } // Workaround for non-animatable buttons in headerbar
+  }
 
   spinner { color: $primary; }
 
diff --git a/src/sass/gtk/apps/_xfce.scss b/src/sass/gtk/apps/_xfce.scss
index b24a1dc3..b8843d78 100644
--- a/src/sass/gtk/apps/_xfce.scss
+++ b/src/sass/gtk/apps/_xfce.scss
@@ -24,8 +24,12 @@
 
     min-height: 16px;
     min-width: 16px;
-    padding: 0;
+    padding: 0 $space-size;
     border-radius: 0;
+
+    &.flat.toggle {
+      padding: 0 $space-size;
+    }
   }
 
   .tasklist button {