From 07c0f4aa7adaaf08371ff2b9042e1208295c1946 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Mon, 14 Apr 2025 08:32:45 +0800
Subject: [PATCH] update

---
 src/sass/libadwaita/_colors.scss              |  6 ++---
 src/sass/libadwaita/_drawing.scss             |  6 ++---
 src/sass/libadwaita/_variables.scss           |  4 ++--
 src/sass/libadwaita/apps/_nautilus.scss       |  2 +-
 src/sass/libadwaita/widgets/_buttons.scss     | 24 +++++++++----------
 .../libadwaita/widgets/_message-dialog.scss   |  4 ++--
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/sass/libadwaita/_colors.scss b/src/sass/libadwaita/_colors.scss
index 669c4773..c18d329c 100644
--- a/src/sass/libadwaita/_colors.scss
+++ b/src/sass/libadwaita/_colors.scss
@@ -95,9 +95,9 @@ $selected_active_color: gtkalpha(currentColor, .19);
 
 $view_hover_color: gtkalpha(currentColor, .04);
 $view_active_color: gtkalpha(currentColor, .08);
-$view_selected_color: gtkalpha($accent_bg_color, .25);
-$view_selected_hover_color: gtkalpha($accent_bg_color, .32);
-$view_selected_active_color: gtkalpha($accent_bg_color, .39);
+$view_selected_color: gtkalpha($accent_color, .25);
+$view_selected_hover_color: gtkalpha($accent_color, .32);
+$view_selected_active_color: gtkalpha($accent_color, .39);
 
 $trough_color: gtkalpha(currentColor, .15);
 $trough_hover_color: gtkalpha(currentColor, .2);
diff --git a/src/sass/libadwaita/_drawing.scss b/src/sass/libadwaita/_drawing.scss
index 8cf4639d..de4a7ae3 100644
--- a/src/sass/libadwaita/_drawing.scss
+++ b/src/sass/libadwaita/_drawing.scss
@@ -182,20 +182,20 @@
   }
 
   @if $t == checked {
-    background-color: $accent_color;
+    background-color: $accent_bg_color;
     color: $accent_fg_color;
   }
 
   @if $t == checked-hover {
     outline-color: transparent;
-    background-color: gtkmix($accent_fg_color, $accent_color, 5%);
+    background-color: gtkmix($accent_fg_color, $accent_bg_color, 5%);
     color: $accent_fg_color;
   }
 
   @if $t == checked-active {
     animation: none;
     outline-color: transparent;
-    background-color: gtkmix($accent_fg_color, $accent_color, 12%);
+    background-color: gtkmix($accent_fg_color, $accent_bg_color, 12%);
     background-image: none;
     color: $accent_fg_color;
   }
diff --git a/src/sass/libadwaita/_variables.scss b/src/sass/libadwaita/_variables.scss
index d15b9af9..9fc0bdd4 100644
--- a/src/sass/libadwaita/_variables.scss
+++ b/src/sass/libadwaita/_variables.scss
@@ -12,8 +12,8 @@ $menu_margin: $base_padding; //margin around menuitems & sidebar items
 $menu_padding: $base_padding * 2; //inner menuitem padding
 
 $small_size: if($compact == 'false', 24px, 22px);
-$medium_size: if($compact == 'false', 36px, 32px);
-$large_size: if($compact == 'false', 48px, 40px);
+$medium_size: if($compact == 'false', 34px, 30px);
+$large_size: if($compact == 'false', 46px, 38px);
 
 $menuitem_size: if($compact == 'false', 28px, 24px);
 
diff --git a/src/sass/libadwaita/apps/_nautilus.scss b/src/sass/libadwaita/apps/_nautilus.scss
index d9c93a58..4524d07b 100644
--- a/src/sass/libadwaita/apps/_nautilus.scss
+++ b/src/sass/libadwaita/apps/_nautilus.scss
@@ -7,7 +7,7 @@
   margin: if($gnome_version == 'default', $base_padding, $base_padding / 2);
   border-style: none;
   border-radius: $button_radius;
-  background-color: $accent_color;
+  background-color: $accent_bg_color;
   color: $accent_fg_color;
   box-shadow: $shadow-z3;
 
diff --git a/src/sass/libadwaita/widgets/_buttons.scss b/src/sass/libadwaita/widgets/_buttons.scss
index 477edf63..6b480366 100644
--- a/src/sass/libadwaita/widgets/_buttons.scss
+++ b/src/sass/libadwaita/widgets/_buttons.scss
@@ -154,11 +154,11 @@ button {
 
     > box,
     > box > box {
-      border-spacing: 4px;
+      border-spacing: $base_margin;
 
       > label {
-        padding-left: 2px;
-        padding-right: 2px;
+        padding-left: $base_margin / 2;
+        padding-right: $base_margin / 2;
       }
     }
   }
@@ -167,10 +167,10 @@ button {
     padding-left: $base_padding * 1.5;
     padding-right: $base_padding * 1.5;
 
-    > box { border-spacing: 4px; }
+    > box { border-spacing: $base_margin; }
 
     &.text-button {
-      > box { border-spacing: 4px; }
+      > box { border-spacing: $base_margin; }
     }
   }
 
@@ -183,8 +183,8 @@ button {
   // big standalone buttons like in Documents pager
   @at-root %osd_button,
   &.osd {
-    min-width: 32px;
-    min-height: 32px;
+    min-width: $medium_size;
+    min-height: $medium_size;
     @include focus-ring($outer: true, $offset: 1px, $transition: $button_transition);
 
     color: $osd_fg_color;
@@ -270,13 +270,13 @@ button {
     // padding added too.
 
     > label {
-      padding: 0 6px;
-      margin: 0 -6px;
+      padding: 0 $base_padding;
+      margin: 0 -$base_padding;
     }
 
     > image {
-      padding: 3px 6px;
-      margin: -3px -6px;
+      padding: $base_padding / 2 $base_padding;
+      margin: -$base_padding / 2 -$base_padding;
     }
 
     &.text-button { min-width: 100px; }
@@ -290,7 +290,7 @@ button {
   // hide separators
   &.font {
     separator { background-color: transparent; }
-    > box { border-spacing: 6px; }
+    > box { border-spacing: $base_padding; }
     > box > box > label { font-weight: bold; }
   }
 
diff --git a/src/sass/libadwaita/widgets/_message-dialog.scss b/src/sass/libadwaita/widgets/_message-dialog.scss
index da649587..030324d3 100644
--- a/src/sass/libadwaita/widgets/_message-dialog.scss
+++ b/src/sass/libadwaita/widgets/_message-dialog.scss
@@ -109,7 +109,7 @@ window.messagedialog {
       margin: 0;
 
       &.suggested {
-        color: $accent_color;
+        color: $accent_bg_color;
       }
   
       &.destructive {
@@ -157,7 +157,7 @@ dialog.alert.floating {
       margin: 0;
 
       &.suggested {
-        color: $accent_color;
+        color: $accent_bg_color;
       }
   
       &.destructive {