From aee637dea4f52eb7d7d4f40024dc167c6a0d3482 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 30 Jan 2022 13:12:53 +0800
Subject: [PATCH] Fixed issues

---
 src/sass/gtk/_common-3.0.scss      | 18 +++++++++++----
 src/sass/gtk/apps/_gnome-3.22.scss | 36 +++++++++++++++++-------------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 66e3755..15284a3 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -652,8 +652,8 @@ $_dot_color: $selected_bg_color;
 %flat_button {
   @include button(flat-normal);
   &:hover { @include button(flat-hover); }
-  &:active { @include button(flat-active); }
-  &:checked { @include button(flat-checked); }
+  &:active, &:active:hover { @include button(flat-active); }
+  &:checked, &:checked:hover { @include button(flat-checked); }
   &:disabled { @include button(flat-insensitive); }
 }
 
@@ -688,8 +688,6 @@ button {
       &:active { transition: $button_transition; }
     }
 
-    &:checked:hover { background-image: none; }
-
     &.toggle.popup:not(.colored) {
       min-width: $menuitem_size - 8px;
     }
@@ -727,6 +725,18 @@ button {
     }
   }
 
+  .background &.flat { // reset
+    &:active, &:checked {
+      @include button(flat-active);
+    }
+
+    &:disabled {
+      &:active, &:checked {
+        @include button(flat-insensitive-active);
+      }
+    }
+  }
+
   &.image-button:not(.circular), &.popup:not(.circular) {
     min-height: $menuitem_size - 4px;
     padding-left: $container_padding;
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 250c10a..dce7057 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -1961,7 +1961,7 @@ window.background.csd {
   }
 }
 
-tabbox {
+.background tabbox {
   @if $monterey == 'false' {
     background-color: darken($header_bg, 10%);
     box-shadow: inset 0 -1px $borders_color;
@@ -1985,24 +1985,13 @@ tabbox {
       }
     }
 
-    button.tab-close-button {
+    button {
+      @extend %flat_button;
       border-radius: 3px;
       border: none;
       padding: 0;
-      @extend %flat_button;
-
-      @if $monterey == 'false' {
-        min-height: $small_size;
-        min-width: $small_size;
-        margin-top: 2px;
-        margin-bottom: 2px;
-      } @else {
-        min-height: 16px;
-        min-width: 16px;
-        margin-top: 4px;
-        margin-bottom: 4px;
-        margin-right: -$container_padding;
-      }
+      min-height: $small_size;
+      min-width: $small_size;
 
       &:hover {
         color: $fg_color;
@@ -2013,6 +2002,21 @@ tabbox {
         color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
         background-color: rgba($borders_color, 0.2);
       }
+
+      &.tab-close-button {
+        @if $monterey == 'false' {
+          min-height: $small_size;
+          min-width: $small_size;
+          margin-top: 2px;
+          margin-bottom: 2px;
+        } @else {
+          min-height: 16px;
+          min-width: 16px;
+          margin-top: 4px;
+          margin-bottom: 4px;
+          margin-right: -$container_padding;
+        }
+      }
     }
   }
 }