From 05f46af9a90ad9e85b1b304e54310ca99cf70f66 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Thu, 3 Nov 2022 11:28:17 +0800
Subject: [PATCH] update

---
 src/_sass/gtk/_common-4.0.scss    | 33 +++++++++++++------------
 src/gtk/4.0/gtk-Compact.css       | 40 ++++++++++++++-----------------
 src/gtk/4.0/gtk-Dark-Compact.css  | 40 ++++++++++++++-----------------
 src/gtk/4.0/gtk-Dark.css          | 40 ++++++++++++++-----------------
 src/gtk/4.0/gtk-Light-Compact.css | 40 ++++++++++++++-----------------
 src/gtk/4.0/gtk-Light.css         | 40 ++++++++++++++-----------------
 src/gtk/4.0/gtk.css               | 40 ++++++++++++++-----------------
 7 files changed, 124 insertions(+), 149 deletions(-)

diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index 0073616..078b7bd 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -1624,8 +1624,17 @@ popover.menu {
     color: $text;
     font: initial;
     text-shadow: none;
+    border-spacing: $space-size;
     @extend %button-flat-simple;
 
+    accelerator {
+      color: $text-disabled;
+
+      &:disabled {
+        color: $divider;
+      }
+    }
+
     arrow {
       &.left { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); }
       &.right { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); }
@@ -2248,6 +2257,9 @@ radio {
   &:not(:hover):focus { box-shadow: inset 0 0 0 9999px transparent; }
 
   popover modelbutton.flat & {
+    margin: 0; // this is a workaround for a menu check/radio size allocation issue
+    padding: 0;
+
     &, &:focus, &:hover, &:focus:hover, &:active, &:disabled {
       transition: none; // FIXME: this is a workaround for a popover check/radio long transition issue
       box-shadow: none;
@@ -2257,6 +2269,10 @@ radio {
 
     &:not(:checked):not(:indeterminate):not(:disabled) { color: $text-secondary; }
 
+    &, &:hover, &:disabled {
+      box-shadow: none;
+    }
+
     &.left:dir(rtl) {
       margin-left: -12px;
       margin-right: -4px;
@@ -2267,23 +2283,6 @@ radio {
       margin-right: -12px;
     }
   }
-
-  popover.menu & {
-    transition: none;
-    margin: 0; // this is a workaround for a menu check/radio size allocation issue
-    padding: 0;
-
-    &:dir(ltr) { margin-right: 8px; }
-
-    &:dir(rtl) { margin-left: 8px; }
-
-    &:not(:checked):not(:indeterminate):not(:disabled) { color: $text-secondary; }
-
-    &, &:hover, &:disabled {
-      box-shadow: none;
-      // color: inherit;
-    }
-  }
 }
 
 %check,
diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css
index 680793b..6a2d9fb 100644
--- a/src/gtk/4.0/gtk-Compact.css
+++ b/src/gtk/4.0/gtk-Compact.css
@@ -2070,6 +2070,15 @@ popover.menu modelbutton {
   color: rgba(0, 0, 0, 0.87);
   font: initial;
   text-shadow: none;
+  border-spacing: 4px;
+}
+
+popover.menu modelbutton accelerator {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+popover.menu modelbutton accelerator:disabled {
+  color: rgba(0, 0, 0, 0.12);
 }
 
 popover.menu modelbutton arrow.left {
@@ -2700,6 +2709,11 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
+popover modelbutton.flat check, popover modelbutton.flat radio {
+  margin: 0;
+  padding: 0;
+}
+
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
   transition: none;
   box-shadow: none;
@@ -2711,6 +2725,10 @@ popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled),
   color: rgba(0, 0, 0, 0.6);
 }
 
+popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
+  box-shadow: none;
+}
+
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
@@ -2721,28 +2739,6 @@ popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.ri
   margin-right: -12px;
 }
 
-popover.menu check, popover.menu radio {
-  transition: none;
-  margin: 0;
-  padding: 0;
-}
-
-popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
-}
-
-popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
-  box-shadow: none;
-}
-
 
 check {
   -gtk-icon-size: 24px;
diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css
index 2f96f42..0c8e0ca 100644
--- a/src/gtk/4.0/gtk-Dark-Compact.css
+++ b/src/gtk/4.0/gtk-Dark-Compact.css
@@ -2070,6 +2070,15 @@ popover.menu modelbutton {
   color: white;
   font: initial;
   text-shadow: none;
+  border-spacing: 4px;
+}
+
+popover.menu modelbutton accelerator {
+  color: rgba(255, 255, 255, 0.5);
+}
+
+popover.menu modelbutton accelerator:disabled {
+  color: rgba(255, 255, 255, 0.12);
 }
 
 popover.menu modelbutton arrow.left {
@@ -2700,6 +2709,11 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
+popover modelbutton.flat check, popover modelbutton.flat radio {
+  margin: 0;
+  padding: 0;
+}
+
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
   transition: none;
   box-shadow: none;
@@ -2711,6 +2725,10 @@ popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled),
   color: rgba(255, 255, 255, 0.7);
 }
 
+popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
+  box-shadow: none;
+}
+
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
@@ -2721,28 +2739,6 @@ popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.ri
   margin-right: -12px;
 }
 
-popover.menu check, popover.menu radio {
-  transition: none;
-  margin: 0;
-  padding: 0;
-}
-
-popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
-}
-
-popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
-  box-shadow: none;
-}
-
 
 check {
   -gtk-icon-size: 24px;
diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
index f3a56bf..746a57d 100644
--- a/src/gtk/4.0/gtk-Dark.css
+++ b/src/gtk/4.0/gtk-Dark.css
@@ -2070,6 +2070,15 @@ popover.menu modelbutton {
   color: white;
   font: initial;
   text-shadow: none;
+  border-spacing: 6px;
+}
+
+popover.menu modelbutton accelerator {
+  color: rgba(255, 255, 255, 0.5);
+}
+
+popover.menu modelbutton accelerator:disabled {
+  color: rgba(255, 255, 255, 0.12);
 }
 
 popover.menu modelbutton arrow.left {
@@ -2700,6 +2709,11 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
+popover modelbutton.flat check, popover modelbutton.flat radio {
+  margin: 0;
+  padding: 0;
+}
+
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
   transition: none;
   box-shadow: none;
@@ -2711,6 +2725,10 @@ popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled),
   color: rgba(255, 255, 255, 0.7);
 }
 
+popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
+  box-shadow: none;
+}
+
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
@@ -2721,28 +2739,6 @@ popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.ri
   margin-right: -12px;
 }
 
-popover.menu check, popover.menu radio {
-  transition: none;
-  margin: 0;
-  padding: 0;
-}
-
-popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
-}
-
-popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
-  box-shadow: none;
-}
-
 
 check {
   -gtk-icon-size: 24px;
diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css
index 9ba3c77..4d00968 100644
--- a/src/gtk/4.0/gtk-Light-Compact.css
+++ b/src/gtk/4.0/gtk-Light-Compact.css
@@ -2070,6 +2070,15 @@ popover.menu modelbutton {
   color: rgba(0, 0, 0, 0.87);
   font: initial;
   text-shadow: none;
+  border-spacing: 4px;
+}
+
+popover.menu modelbutton accelerator {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+popover.menu modelbutton accelerator:disabled {
+  color: rgba(0, 0, 0, 0.12);
 }
 
 popover.menu modelbutton arrow.left {
@@ -2700,6 +2709,11 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
+popover modelbutton.flat check, popover modelbutton.flat radio {
+  margin: 0;
+  padding: 0;
+}
+
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
   transition: none;
   box-shadow: none;
@@ -2711,6 +2725,10 @@ popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled),
   color: rgba(0, 0, 0, 0.6);
 }
 
+popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
+  box-shadow: none;
+}
+
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
@@ -2721,28 +2739,6 @@ popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.ri
   margin-right: -12px;
 }
 
-popover.menu check, popover.menu radio {
-  transition: none;
-  margin: 0;
-  padding: 0;
-}
-
-popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
-}
-
-popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
-  box-shadow: none;
-}
-
 
 check {
   -gtk-icon-size: 24px;
diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
index 79b8d68..937262c 100644
--- a/src/gtk/4.0/gtk-Light.css
+++ b/src/gtk/4.0/gtk-Light.css
@@ -2070,6 +2070,15 @@ popover.menu modelbutton {
   color: rgba(0, 0, 0, 0.87);
   font: initial;
   text-shadow: none;
+  border-spacing: 6px;
+}
+
+popover.menu modelbutton accelerator {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+popover.menu modelbutton accelerator:disabled {
+  color: rgba(0, 0, 0, 0.12);
 }
 
 popover.menu modelbutton arrow.left {
@@ -2700,6 +2709,11 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
+popover modelbutton.flat check, popover modelbutton.flat radio {
+  margin: 0;
+  padding: 0;
+}
+
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
   transition: none;
   box-shadow: none;
@@ -2711,6 +2725,10 @@ popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled),
   color: rgba(0, 0, 0, 0.6);
 }
 
+popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
+  box-shadow: none;
+}
+
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
@@ -2721,28 +2739,6 @@ popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.ri
   margin-right: -12px;
 }
 
-popover.menu check, popover.menu radio {
-  transition: none;
-  margin: 0;
-  padding: 0;
-}
-
-popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
-}
-
-popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
-  box-shadow: none;
-}
-
 
 check {
   -gtk-icon-size: 24px;
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index f2ef02b..d36eee9 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -2070,6 +2070,15 @@ popover.menu modelbutton {
   color: rgba(0, 0, 0, 0.87);
   font: initial;
   text-shadow: none;
+  border-spacing: 6px;
+}
+
+popover.menu modelbutton accelerator {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+popover.menu modelbutton accelerator:disabled {
+  color: rgba(0, 0, 0, 0.12);
 }
 
 popover.menu modelbutton arrow.left {
@@ -2700,6 +2709,11 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
+popover modelbutton.flat check, popover modelbutton.flat radio {
+  margin: 0;
+  padding: 0;
+}
+
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
   transition: none;
   box-shadow: none;
@@ -2711,6 +2725,10 @@ popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled),
   color: rgba(0, 0, 0, 0.6);
 }
 
+popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
+  box-shadow: none;
+}
+
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
@@ -2721,28 +2739,6 @@ popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.ri
   margin-right: -12px;
 }
 
-popover.menu check, popover.menu radio {
-  transition: none;
-  margin: 0;
-  padding: 0;
-}
-
-popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
-}
-
-popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
-  box-shadow: none;
-}
-
 
 check {
   -gtk-icon-size: 24px;