From 21b358c999c9c306a581fa84aac2c41d843e96df Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sat, 12 Oct 2024 21:00:44 +0800
Subject: [PATCH] Fixed #201

---
 src/sass/libadwaita/apps/_nautilus.scss    |  4 ++--
 src/sass/libadwaita/widgets/_sidebars.scss | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/sass/libadwaita/apps/_nautilus.scss b/src/sass/libadwaita/apps/_nautilus.scss
index 53a03dda..b7f10197 100644
--- a/src/sass/libadwaita/apps/_nautilus.scss
+++ b/src/sass/libadwaita/apps/_nautilus.scss
@@ -38,7 +38,7 @@
   border-radius: $button_radius;
   padding: 0;
 
-  @if $colortype == 'fixed' {
+  @if $colorscheme != 'default' or $blackness == 'true' or $colortype == 'fixed' {
     color: $window_fg_color;
   }
 }
@@ -48,7 +48,7 @@
   border-radius: $button_radius;
   @extend %button_basic_flat;
 
-  @if $colortype == 'fixed' {
+  @if $colorscheme != 'default' or $blackness == 'true' or $colortype == 'fixed' {
     @extend %header_button_reset;
   }
 }
diff --git a/src/sass/libadwaita/widgets/_sidebars.scss b/src/sass/libadwaita/widgets/_sidebars.scss
index 46028662..daaf5539 100644
--- a/src/sass/libadwaita/widgets/_sidebars.scss
+++ b/src/sass/libadwaita/widgets/_sidebars.scss
@@ -194,13 +194,24 @@ stacksidebar row {
   }
 }
 
-@if $colortype == 'fixed' {
+@if $colorscheme != 'default' or $blackness == 'true' or $colortype == 'fixed' {
   .content-pane {
     headerbar {
       color: $window_fg_color;
 
-      button:not(.suggested-action):not(.destructive-action) {
-        @extend %header_button_reset;
+      button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
+        &,
+        &.arrow-button,
+        &.image-button,
+        &.image-text-button {
+          @extend %header_button_reset;
+        }
+      }
+
+      menubutton:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
+        &.image-button > button {
+          @extend %header_button_reset;
+        }
       }
 
       entry {
@@ -208,7 +219,7 @@ stacksidebar row {
       }
 
       windowcontrols {
-        > button:not(.suggested-action):not(.destructive-action) {
+        > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
           @if $window_button == 'mac' {
             &.minimize, &.maximize, &.close {
               color: transparent;