From 27f413fb220d01897bd4ef084d773ef42963c767 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Thu, 8 Apr 2021 12:34:27 +0800
Subject: [PATCH] update

---
 src/sass/gtk/_applications.scss | 11 ++++++++---
 src/sass/gtk/_common.scss       | 34 ++++++++++++++-------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 4996c14..edeb30f 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -137,12 +137,17 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
                                                          $header_border 40%);
 }
 
-@mixin color_sidebar() {
+@mixin color_sidebar($s_bg_color: transparent, $sidebar_style: stable) {
   placessidebar.sidebar {
     background-color: transparent;
     min-width: $nautilus_sidebar_size;
     border: none;
 
+    list {
+      background-color: $s_bg_color;
+      border-bottom-left-radius: $wm_radius;
+    }
+
     row.sidebar-row {
       color: $dark_sidebar_fg;
       background-color: transparent;
@@ -158,7 +163,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
       &:backdrop { opacity: 0.85; }
 
       // row style
-      @if $nautilus_style == 'stable' {
+      @if $nautilus_style == 'stable' and $sidebar_style == 'stable' {
         &:hover {
           transition: background-image 0;
           background-repeat: no-repeat;
@@ -442,7 +447,7 @@ dialog.background.csd {
       }
     }
 
-    @include color_sidebar();
+    @include color_sidebar($s_bg_color: $bg_color, $sidebar_style: normal);
   }
 
   filechooserbutton:drop(active) {
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index 0ced654..75df8b5 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -1676,12 +1676,6 @@ window.background > box.vertical > headerbar:not(.titlebar) { // reset headerbar
   }
 }
 
-// Fixes common window border radius problem when it get maximized
-// including GNOME Terminal window can't restore after it get maximized
-window.background.csd.maximized {
-  border-radius: 0 0 0 0;
-}
-
 headerbar, .titlebar {
   button {
     min-height: 26px;
@@ -2272,7 +2266,7 @@ notebook {
     background-color: $base_color;
   }
 
-  &:not(.frame), &:not(.frame) > stack {
+  .csd &:not(.frame), .csd &:not(.frame) > stack {
     border-radius: 0 0 $wm_radius $wm_radius;
   }
 
@@ -3338,7 +3332,9 @@ messagedialog { // Message Dialog styling
           @if $variant == 'light' {
             background-color: $selected_bg_color;
             color: $selected_fg_color;
-          } @else {
+          }
+
+          @else {
             @include button(active);
           }
         }
@@ -3367,8 +3363,6 @@ filechooser {
     background-color: $base_color;
     border-radius: 0 0 $wm_radius $wm_radius;
 
-    placessidebar.sidebar { background-color: transparent; }
-
     stack.view {
       background-color: transparent;
 
@@ -3391,8 +3385,8 @@ filechooser {
     min-width: 1px;
     background-image: image(if($variant=='light', $solid_borders_color, $header_border));
 
-    &:dir(ltr) { margin-left: -1px; }
-    &:dir(rtl) { margin-right: -1px; }
+    // &:dir(ltr) { margin-left: -1px; }
+    // &:dir(rtl) { margin-right: -1px; }
   }
 
   #pathbarbox { border-bottom: 1px solid transparentize($borders_color, 0.5); }
@@ -3627,37 +3621,33 @@ infobar {
   border-style: none;
 
   &.info {
-    background-color: $selected_bg_color;
-
     & > revealer > box,
     &:backdrop > revealer > box {
+      background-color: $selected_bg_color;
       selection { color: $selected_bg_color; }
     }
   }
 
   &.question {
-    background-color: $suggested_color;
-
     & > revealer > box,
     &:backdrop > revealer > box {
+      background-color: $suggested_color;
       selection { color: $suggested_color; }
     }
   }
 
   &.warning {
-    background-color: $warning_color;
-
     & > revealer > box,
     &:backdrop > revealer > box {
+      background-color: $warning_color;
       selection { color: $warning_color; }
     }
   }
 
   &.error {
-    background-color: $error_color;
-
     & > revealer > box,
     &:backdrop > revealer > box {
+      background-color: $error_color;
       selection { color: $error_color; }
     }
   }
@@ -3677,6 +3667,10 @@ infobar {
         @extend %selected-button;
       }
 
+      selection {
+        background-color: $selected_fg_color;
+      }
+
       *:link { @extend %link_selected; }
     }
   }