From 556fa9af5f26be076c4206307543f9811c770617 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Fri, 14 May 2021 23:56:56 +0800
Subject: [PATCH] update

---
 src/sass/gtk/_common-3.0.scss | 30 +++++++++++++-----------------
 src/sass/gtk/_common-4.0.scss | 29 ++++++++++++-----------------
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 4047f580..cbcf7325 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -177,21 +177,6 @@ $list_shadow: if($variant == 'light',
   box-shadow: none;
 }
 
-%circular_button {
-  border-radius: $circular_radius;
-  -gtk-outline-radius: $circular_radius;
-  padding: 0;
-  min-height: $menuitem_size;
-  min-width: $menuitem_size;
-
-  &:active, &:checked {
-    @if $variant=='light' {
-      @include button(flat-active);
-      border-color: rgba(black, 0.2);
-    }
-  }
-}
-
 // Buttons on selected backgrounds
 %selected-button {
   color: $selected_fg_color;
@@ -842,8 +827,19 @@ button {
     &.popup { padding-right: 6px; padding-left: 6px; }
   }
 
-  &.close { // The Bloody Circul Button
-    @extend %circular_button;
+  @at-root %circular_button, &.close { // The Bloody Circul Button
+    border-radius: $circular_radius;
+    -gtk-outline-radius: $circular_radius;
+    padding: 0 0 0 0;
+    min-height: $menuitem_size;
+    min-width: $menuitem_size;
+
+    &:active, &:checked {
+      @if $variant=='light' {
+        @include button(flat-active);
+        border-color: rgba(black, 0.2);
+      }
+    }
   }
 
   &:drop(active) {
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 75253b1f..692e531a 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -154,21 +154,6 @@ $list_shadow: if($variant == 'light',
   box-shadow: none;
 }
 
-%circular_button {
-  border-radius: $circular_radius;
-  -gtk-outline-radius: $circular_radius;
-  padding: 0;
-  min-height: $menuitem_size;
-  min-width: $menuitem_size;
-
-  &:active, &:checked {
-    @if $variant=='light' {
-      @include button(flat-active);
-      border-color: rgba(black, 0.2);
-    }
-  }
-}
-
 // Buttons on selected backgrounds
 %selected-button {
   color: $selected_fg_color;
@@ -832,8 +817,18 @@ button {
     &.popup { padding-right: 6px; padding-left: 6px; }
   }
 
-  &.close { // The Bloody Circul Button
-    @extend %circular_button;
+  @at-root %circular_button, &.close { // The Bloody Circul Button
+    border-radius: $circular_radius;
+    padding: 0 0 0 0;
+    min-height: $menuitem_size;
+    min-width: $menuitem_size;
+
+    &:active, &:checked {
+      @if $variant=='light' {
+        @include button(flat-active);
+        border-color: rgba(black, 0.2);
+      }
+    }
   }
 
   @at-root %button_basic_drop_active,