From ad2f28a1b6f693716f62bca4d97b0d42a0ce5ac6 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Thu, 29 Apr 2021 21:12:20 +0800
Subject: [PATCH] Fixed issues

---
 src/sass/gtk/_applications-3.0.scss |  5 +++-
 src/sass/gtk/_colors-public.scss    | 14 +++++++----
 src/sass/gtk/_common-3.0.scss       | 37 ++++++++++++++++++++++++++++-
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/sass/gtk/_applications-3.0.scss b/src/sass/gtk/_applications-3.0.scss
index 377b1423..6be83d32 100644
--- a/src/sass/gtk/_applications-3.0.scss
+++ b/src/sass/gtk/_applications-3.0.scss
@@ -174,10 +174,13 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
 
     placessidebar.sidebar {
       background-color: transparent;
-      min-width: $nautilus_sidebar_size;
       border: none;
       border-bottom-left-radius: $wm_radius;
 
+      @if $nautilus_style == 'stable' or $nautilus_style == 'default' {
+        min-width: $nautilus_sidebar_size;
+      }
+
       @if $nautilus_style == 'stable' {
         background-image: if($trans == 'true', none, $nautilus_sidebar_image);
       }
diff --git a/src/sass/gtk/_colors-public.scss b/src/sass/gtk/_colors-public.scss
index 062524da..221ff123 100644
--- a/src/sass/gtk/_colors-public.scss
+++ b/src/sass/gtk/_colors-public.scss
@@ -2,25 +2,29 @@
 
 // Sass thinks we're using the colors in the variables as strings and may shoot
 // warning, it's innocuous and can be defeated by using "" + $var
+
+$theme_text: currentColor;
+
 @define-color theme_fg_color #{"" + $fg_color};
-@define-color theme_text_color #{"" + $text_color};
+@define-color theme_text_color #{"" + $theme_text};
 @define-color theme_bg_color #{"" + $bg_color};
 @define-color theme_base_color #{"" + $base_color};
 @define-color theme_selected_bg_color #{"" + $selected_bg_color};
 @define-color theme_selected_fg_color #{"" + $selected_fg_color};
 @define-color fg_color #{"" + $fg_color};
-@define-color text_color #{"" + $text_color};
+@define-color text_color #{"" + $theme_text};
 @define-color bg_color #{"" + $bg_color};
 @define-color base_color #{"" + $base_color};
 @define-color selected_bg_color #{"" + $selected_bg_color};
 @define-color selected_fg_color #{"" + $selected_fg_color};
-@define-color insensitive_bg_color #{"" + $disabled_fg_color};
-@define-color insensitive_fg_color alpha(#{"" + $disabled_fg_color}, 0.5);
+@define-color insensitive_bg_color #{"" + mix($bg_color, $base_color, 60%)};
+@define-color insensitive_fg_color #{"" + $disabled_fg_color};
 @define-color insensitive_base_color #{"" + $base_color};
 @define-color theme_unfocused_fg_color #{"" + $fg_color};
-@define-color theme_unfocused_text_color #{"" + $text_color};
+@define-color theme_unfocused_text_color #{"" + $theme_text};
 @define-color theme_unfocused_bg_color #{"" + $bg_color};
 @define-color theme_unfocused_base_color #{"" + $base_color};
+@define-color unfocused_insensitive_color #{"" + mix($fg_color, $bg_color, 35%)};
 @define-color borders #{"" + $borders_color};
 @define-color unfocused_borders #{"" + $borders_color};
 
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 9508244f..bfb67313 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -3181,7 +3181,42 @@ frame > border.flat,
 
 scrolledwindow {
   viewport.frame { // avoid double borders when viewport inside scrolled window
-    border-style: none;
+    border: none;
+
+    .frame {
+      border: none;
+
+      > textview {
+        border-radius: $bt_radius;
+        background: none;
+
+        > text {
+          border-radius: $bt_radius;
+          border: 1px solid $borders_color;
+        }
+      }
+    }
+
+    > box.vertical list, list.content {
+      @extend %circular_list;
+      padding: 0;
+
+      > row.activatable { @extend %circular_row; }
+
+      list {
+        border: none;
+        box-shadow: none;
+        border-radius: 0;
+        margin: 0;
+        background: none;
+
+        > row.activatable {
+          &, &:first-child, &:last-child {
+            border-radius: 0;
+          }
+        }
+      }
+    }
   }
 
   // This is used by GtkScrolledWindow, when content is touch-dragged past boundaries.