From 8b1128d2cbd9b13b64eb5a23763cfc5d4dbc8b9a Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Sun, 9 May 2021 23:09:57 +0800
Subject: [PATCH] update

---
 src/sass/gtk/_common-3.0.scss | 194 +++++++++++++++++-----------------
 src/sass/gtk/_drawing.scss    |   4 +-
 2 files changed, 102 insertions(+), 96 deletions(-)

diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 4d6f3dba..066e6aa0 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1377,6 +1377,105 @@ actionbar {
 // Headerbars
 //
 
+%header_separator {
+  min-width: 0;
+  min-height: 0;
+  background-color: transparent;
+  border: none;
+
+  &:backdrop { opacity: 0.65; }
+}
+
+// Headerbar Entries
+%headerbar_entrys {
+  min-height: 22px;
+  @include entry(header-normal);
+
+  &:backdrop { opacity: 0.65; background-image: none; }
+
+  &:hover {
+    @include entry(header-hover);
+  }
+
+  &:focus {
+    @include entry(header-focus);
+  }
+
+  &:disabled {
+    @include entry(header-insensitive);
+  }
+
+  selection:focus {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+
+  progress {
+    border-color: $progress_color;
+    background-image: none;
+    background-color: transparent;
+  }
+
+  @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $light_fg_color),
+                                          (error, $error_color, $light_fg_color) {
+    &.#{$e_type} {
+      color: $e_fg_color;
+      border-color: if($variant=='light', $e_color, $entry_border);
+      background-color: mix($e_color, $header_bg, 60%);
+
+      &:focus {
+        color: $e_fg_color;
+        background-color: $e_color;
+      }
+
+      selection, selection:focus {
+        background-color: $e_fg_color;
+        color: $e_color;
+      }
+    }
+  }
+}
+
+// Headerbar Buttons
+%headerbar_buttons {
+  min-height: 26px;
+  min-width: 22px;
+  @include button(header-normal);
+
+  &:backdrop { opacity: 0.65; background-image: none; }
+
+  &:hover {
+    @include button(header-hover);
+    transition: $button_transition;
+  }
+
+  &:active, &:active:hover {
+    @include button(header-active);
+    transition: $button_transition;
+    transition-duration: 300ms;
+  }
+
+  &:checked {
+    @include button(header-checked);
+    transition: $button_transition;
+    transition-duration: 300ms;
+
+    &:hover { background-image: none; }
+
+    &:disabled {
+      @include button(header-insensitive-active);
+    }
+  }
+
+  &:disabled {
+    @include button(header-insensitive);
+  }
+
+  &.flat {
+    @include button(undecorated);
+  }
+}
+
 headerbar {
   min-height: 40px;
   padding: 0 16px;
@@ -1763,101 +1862,6 @@ headerbar, .titlebar {
   }
 }
 
-%header_separator {
-  min-width: 0;
-  min-height: 0;
-  background-color: transparent;
-  border: none;
-
-  &:backdrop { opacity: 0.65; }
-}
-
-// Headerbar Entries
-%headerbar_entrys {
-  min-height: 22px;
-  @include entry(header-normal);
-
-  &:backdrop { opacity: 0.65; background-image: none; }
-
-  &:hover {
-    @include entry(header-hover);
-  }
-
-  &:focus {
-    @include entry(header-focus);
-  }
-
-  &:disabled {
-    @include entry(header-insensitive);
-  }
-
-  selection:focus {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-
-  progress {
-    border-color: $progress_color;
-    background-image: none;
-    background-color: transparent;
-  }
-
-  @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $light_fg_color),
-                                          (error, $error_color, $light_fg_color) {
-    &.#{$e_type} {
-      color: $e_fg_color;
-      border-color: if($variant=='light', $e_color, $entry_border);
-      background-color: mix($e_color, $header_bg, 60%);
-
-      &:focus {
-        color: $e_fg_color;
-        background-color: $e_color;
-      }
-
-      selection, selection:focus {
-        background-color: $e_fg_color;
-        color: $e_color;
-      }
-    }
-  }
-}
-
-// Headerbar Buttons
-%headerbar_buttons {
-  min-height: 26px;
-  min-width: 22px;
-  @include button(header-normal);
-
-  &:backdrop { opacity: 0.65; background-image: none; }
-
-  &:hover {
-    @include button(header-hover);
-    transition: $button_transition;
-  }
-
-  &:active, &:active:hover {
-    @include button(header-active);
-    transition: $button_transition;
-    transition-duration: 300ms;
-  }
-
-  &:checked {
-    @include button(header-checked);
-    transition: $button_transition;
-    transition-duration: 300ms;
-
-    &:hover { background-image: none; }
-  }
-
-  &:disabled {
-    &, &:checked, &:active { @include button(header-insensitive); }
-  }
-
-  &.flat {
-    @include button(undecorated);
-  }
-}
-
 //
 // Pathbars
 //
diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss
index 42a19c55..9bb9df8a 100644
--- a/src/sass/gtk/_drawing.scss
+++ b/src/sass/gtk/_drawing.scss
@@ -292,7 +292,8 @@
   // insensitive header-bar button
   //
     label, & { color: rgba($header_fg, 0.35); }
-    background: none;
+    background-image: none;
+    background-color: transparent;
     box-shadow: none;
   }
 
@@ -301,6 +302,7 @@
   // header-bar insensitive pushed button
   //
     color: rgba($header_fg, 0.35);
+    background-image: none;
     background-color: transparent;
   }