From 9bc382b7c1a4bbc05dd4288be5814aa8df90ffa8 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 9 Apr 2023 12:44:05 +0800
Subject: [PATCH] Fixed issues

---
 src/sass/gtk/_common-3.0.scss | 28 +++++++++++++++++++++-------
 src/sass/gtk/_common-4.0.scss |  5 +++--
 src/sass/gtk/apps/_nemo.scss  |  8 ++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 04057fc4..02a1dda3 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1323,9 +1323,15 @@ searchbar > revealer > box {
     min-height: $small-size;
     padding: $space-size $space-size * 2;
     border-radius: $window-radius $window-radius 0 0;
-    box-shadow: inset 0 1px highlight($titlebar);
+    border: none;
     background-color: $titlebar;
 
+    @if $variant == 'light' or $rimless == 'true' {
+      box-shadow: inset 0 1px highlight($titlebar);
+    } @else {
+      box-shadow: none;
+    }
+
     &:backdrop {
       background-color: $titlebar-backdrop;
     }
@@ -1348,9 +1354,9 @@ searchbar > revealer > box {
       padding: $space-size;
 
       @if $rimless == 'false' and $variant == 'dark' {
-        box-shadow: inset 0 -1px $border;
+        box-shadow: none;
       } @else {
-        box-shadow: inset 0 1px highlight($titlebar), inset 0 -1px $border;
+        box-shadow: inset 0 1px highlight($titlebar);
       }
     }
 
@@ -3102,6 +3108,12 @@ messagedialog { // Message Dialog styling
   &.background {
     background-color: if($variant == 'dark', background(f), background(c));
 
+    .titlebar {
+      &, &:backdrop {
+        background-color: if($variant == 'dark', background(f), background(c));
+      }
+    }
+
     &.csd { // rounded bottom border styling for csd version
       border-bottom-left-radius: $window-radius;
       border-bottom-right-radius: $window-radius;
@@ -3111,6 +3123,12 @@ messagedialog { // Message Dialog styling
       } @else {
         background-color: $surface;
       }
+
+      .titlebar {
+        &, &:backdrop {
+          background-color: if($variant == 'dark', transparent, $surface);
+        }
+      }
     }
   }
 
@@ -3118,10 +3136,6 @@ messagedialog { // Message Dialog styling
     .titlebar {
       border: none;
       box-shadow: none;
-
-      &, &:backdrop {
-        background-color: transparent;
-      }
     }
   }
 
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 6c680130..2b117373 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1686,9 +1686,10 @@ headerbar {
   }
 
   &.default-decoration {
-    min-height: $small-size;
-    padding: $space-size;
+    min-height: $medium-size;
+    // padding: $space-size;
     box-shadow: inset 0 1px highlight($titlebar);
+    border: none;
 
     windowcontrols {
       button,
diff --git a/src/sass/gtk/apps/_nemo.scss b/src/sass/gtk/apps/_nemo.scss
index b23ac481..5d2c6ffe 100644
--- a/src/sass/gtk/apps/_nemo.scss
+++ b/src/sass/gtk/apps/_nemo.scss
@@ -105,6 +105,14 @@
     }
   }
 
+  &.background.csd .toolbar {
+    border-radius: 0 0 $window-radius $window-radius;
+  }
+
+  &.background.csd.maximized .toolbar {
+    border-radius: 0;
+  }
+
   .view {
     selection,
     &:selected {