From b2e2d69a7d673f9925114cabeef286a4db7a8744 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 27 Nov 2022 21:33:39 +0800
Subject: [PATCH] update

---
 src/_sass/gtk/_common-4.0.scss     |  6 +++---
 src/_sass/gtk/apps/_gnome-4.0.scss | 10 ++++++++++
 src/gtk/4.0/gtk-Compact.css        | 16 ++++++++--------
 src/gtk/4.0/gtk-Dark-Compact.css   | 16 ++++++++--------
 src/gtk/4.0/gtk-Dark.css           | 16 ++++++++--------
 src/gtk/4.0/gtk-Light-Compact.css  | 16 ++++++++--------
 src/gtk/4.0/gtk-Light.css          | 16 ++++++++--------
 src/gtk/4.0/gtk.css                | 16 ++++++++--------
 8 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index c8144a1..a2d5bb0 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -1628,7 +1628,7 @@ menubar {
 
 popover.menu {
   box.inline-buttons {
-    padding: 0 $space-size;
+    padding: 0 $space-size + 8px;
 
     button.image-button.model {
       min-height: $menuitem-size;
@@ -1685,7 +1685,7 @@ popover.menu {
 
   label.title {
     font-weight: bold;
-    padding: 4px ($space-size + 20px); //this will fall apart with font sizing
+    padding: $space-size / 2 ($space-size + 6px) * 2 + $space-size + 2px; //this will fall apart with font sizing
   }
 }
 
@@ -2325,7 +2325,7 @@ radio {
 
   &:not(:hover):focus { box-shadow: inset 0 0 0 9999px transparent; }
 
-  popover modelbutton.flat & {
+  popover modelbutton & {
     margin: 0; // this is a workaround for a menu check/radio size allocation issue
     padding: 0;
 
diff --git a/src/_sass/gtk/apps/_gnome-4.0.scss b/src/_sass/gtk/apps/_gnome-4.0.scss
index 2b1fd93..c100e7d 100644
--- a/src/_sass/gtk/apps/_gnome-4.0.scss
+++ b/src/_sass/gtk/apps/_gnome-4.0.scss
@@ -690,6 +690,16 @@ panelframetabbar {
   }
 }
 
+// panelframe {
+//   tabview > stack {
+//     background-color: $fill;
+//
+//     textview.sourceview.view {
+//       background-color: $fill;
+//     }
+//   }
+// }
+
 panelstatusbar {
   background-color: $background;
 
diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css
index bc6e7e0..4dc1cb8 100644
--- a/src/gtk/4.0/gtk-Compact.css
+++ b/src/gtk/4.0/gtk-Compact.css
@@ -2051,7 +2051,7 @@ menubar > item popover.menu.background popover.menu.background > contents {
  * Popover Base Menus *
  **********************/
 popover.menu box.inline-buttons {
-  padding: 0 4px;
+  padding: 0 12px;
 }
 
 popover.menu box.inline-buttons button.image-button.model {
@@ -2108,7 +2108,7 @@ popover.menu check.right {
 
 popover.menu label.title {
   font-weight: bold;
-  padding: 4px 24px;
+  padding: 2px 26px;
 }
 
 /************
@@ -2755,32 +2755,32 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
-popover modelbutton.flat check, popover modelbutton.flat radio {
+popover modelbutton check, popover modelbutton 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 {
+popover modelbutton check, popover modelbutton check:focus, popover modelbutton check:hover, popover modelbutton check:focus:hover, popover modelbutton check:active, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:focus, popover modelbutton radio:hover, popover modelbutton radio:focus:hover, popover modelbutton radio:active, popover modelbutton radio:disabled {
   transition: none;
   box-shadow: none;
   background: none;
   border: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
+popover modelbutton check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton radio: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 {
+popover modelbutton check, popover modelbutton check:hover, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:hover, popover modelbutton radio:disabled {
   box-shadow: none;
 }
 
-popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
+popover modelbutton check.left:dir(rtl), popover modelbutton radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
 }
 
-popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
+popover modelbutton check.right:dir(ltr), popover modelbutton radio.right:dir(ltr) {
   margin-left: -4px;
   margin-right: -12px;
 }
diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css
index 749e438..49851b1 100644
--- a/src/gtk/4.0/gtk-Dark-Compact.css
+++ b/src/gtk/4.0/gtk-Dark-Compact.css
@@ -2051,7 +2051,7 @@ menubar > item popover.menu.background popover.menu.background > contents {
  * Popover Base Menus *
  **********************/
 popover.menu box.inline-buttons {
-  padding: 0 4px;
+  padding: 0 12px;
 }
 
 popover.menu box.inline-buttons button.image-button.model {
@@ -2108,7 +2108,7 @@ popover.menu check.right {
 
 popover.menu label.title {
   font-weight: bold;
-  padding: 4px 24px;
+  padding: 2px 26px;
 }
 
 /************
@@ -2755,32 +2755,32 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
-popover modelbutton.flat check, popover modelbutton.flat radio {
+popover modelbutton check, popover modelbutton 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 {
+popover modelbutton check, popover modelbutton check:focus, popover modelbutton check:hover, popover modelbutton check:focus:hover, popover modelbutton check:active, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:focus, popover modelbutton radio:hover, popover modelbutton radio:focus:hover, popover modelbutton radio:active, popover modelbutton radio:disabled {
   transition: none;
   box-shadow: none;
   background: none;
   border: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
+popover modelbutton check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton radio: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 {
+popover modelbutton check, popover modelbutton check:hover, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:hover, popover modelbutton radio:disabled {
   box-shadow: none;
 }
 
-popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
+popover modelbutton check.left:dir(rtl), popover modelbutton radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
 }
 
-popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
+popover modelbutton check.right:dir(ltr), popover modelbutton radio.right:dir(ltr) {
   margin-left: -4px;
   margin-right: -12px;
 }
diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
index 8ad255a..3edfa04 100644
--- a/src/gtk/4.0/gtk-Dark.css
+++ b/src/gtk/4.0/gtk-Dark.css
@@ -2051,7 +2051,7 @@ menubar > item popover.menu.background popover.menu.background > contents {
  * Popover Base Menus *
  **********************/
 popover.menu box.inline-buttons {
-  padding: 0 6px;
+  padding: 0 14px;
 }
 
 popover.menu box.inline-buttons button.image-button.model {
@@ -2108,7 +2108,7 @@ popover.menu check.right {
 
 popover.menu label.title {
   font-weight: bold;
-  padding: 4px 26px;
+  padding: 3px 32px;
 }
 
 /************
@@ -2755,32 +2755,32 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
-popover modelbutton.flat check, popover modelbutton.flat radio {
+popover modelbutton check, popover modelbutton 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 {
+popover modelbutton check, popover modelbutton check:focus, popover modelbutton check:hover, popover modelbutton check:focus:hover, popover modelbutton check:active, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:focus, popover modelbutton radio:hover, popover modelbutton radio:focus:hover, popover modelbutton radio:active, popover modelbutton radio:disabled {
   transition: none;
   box-shadow: none;
   background: none;
   border: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
+popover modelbutton check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton radio: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 {
+popover modelbutton check, popover modelbutton check:hover, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:hover, popover modelbutton radio:disabled {
   box-shadow: none;
 }
 
-popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
+popover modelbutton check.left:dir(rtl), popover modelbutton radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
 }
 
-popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
+popover modelbutton check.right:dir(ltr), popover modelbutton radio.right:dir(ltr) {
   margin-left: -4px;
   margin-right: -12px;
 }
diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css
index 26a6138..540aadd 100644
--- a/src/gtk/4.0/gtk-Light-Compact.css
+++ b/src/gtk/4.0/gtk-Light-Compact.css
@@ -2051,7 +2051,7 @@ menubar > item popover.menu.background popover.menu.background > contents {
  * Popover Base Menus *
  **********************/
 popover.menu box.inline-buttons {
-  padding: 0 4px;
+  padding: 0 12px;
 }
 
 popover.menu box.inline-buttons button.image-button.model {
@@ -2108,7 +2108,7 @@ popover.menu check.right {
 
 popover.menu label.title {
   font-weight: bold;
-  padding: 4px 24px;
+  padding: 2px 26px;
 }
 
 /************
@@ -2755,32 +2755,32 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
-popover modelbutton.flat check, popover modelbutton.flat radio {
+popover modelbutton check, popover modelbutton 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 {
+popover modelbutton check, popover modelbutton check:focus, popover modelbutton check:hover, popover modelbutton check:focus:hover, popover modelbutton check:active, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:focus, popover modelbutton radio:hover, popover modelbutton radio:focus:hover, popover modelbutton radio:active, popover modelbutton radio:disabled {
   transition: none;
   box-shadow: none;
   background: none;
   border: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
+popover modelbutton check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton radio: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 {
+popover modelbutton check, popover modelbutton check:hover, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:hover, popover modelbutton radio:disabled {
   box-shadow: none;
 }
 
-popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
+popover modelbutton check.left:dir(rtl), popover modelbutton radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
 }
 
-popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
+popover modelbutton check.right:dir(ltr), popover modelbutton radio.right:dir(ltr) {
   margin-left: -4px;
   margin-right: -12px;
 }
diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
index a33fb96..6820b98 100644
--- a/src/gtk/4.0/gtk-Light.css
+++ b/src/gtk/4.0/gtk-Light.css
@@ -2051,7 +2051,7 @@ menubar > item popover.menu.background popover.menu.background > contents {
  * Popover Base Menus *
  **********************/
 popover.menu box.inline-buttons {
-  padding: 0 6px;
+  padding: 0 14px;
 }
 
 popover.menu box.inline-buttons button.image-button.model {
@@ -2108,7 +2108,7 @@ popover.menu check.right {
 
 popover.menu label.title {
   font-weight: bold;
-  padding: 4px 26px;
+  padding: 3px 32px;
 }
 
 /************
@@ -2755,32 +2755,32 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
-popover modelbutton.flat check, popover modelbutton.flat radio {
+popover modelbutton check, popover modelbutton 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 {
+popover modelbutton check, popover modelbutton check:focus, popover modelbutton check:hover, popover modelbutton check:focus:hover, popover modelbutton check:active, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:focus, popover modelbutton radio:hover, popover modelbutton radio:focus:hover, popover modelbutton radio:active, popover modelbutton radio:disabled {
   transition: none;
   box-shadow: none;
   background: none;
   border: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
+popover modelbutton check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton radio: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 {
+popover modelbutton check, popover modelbutton check:hover, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:hover, popover modelbutton radio:disabled {
   box-shadow: none;
 }
 
-popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
+popover modelbutton check.left:dir(rtl), popover modelbutton radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
 }
 
-popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
+popover modelbutton check.right:dir(ltr), popover modelbutton radio.right:dir(ltr) {
   margin-left: -4px;
   margin-right: -12px;
 }
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index 1a4f799..eec8b0e 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -2051,7 +2051,7 @@ menubar > item popover.menu.background popover.menu.background > contents {
  * Popover Base Menus *
  **********************/
 popover.menu box.inline-buttons {
-  padding: 0 6px;
+  padding: 0 14px;
 }
 
 popover.menu box.inline-buttons button.image-button.model {
@@ -2108,7 +2108,7 @@ popover.menu check.right {
 
 popover.menu label.title {
   font-weight: bold;
-  padding: 4px 26px;
+  padding: 3px 32px;
 }
 
 /************
@@ -2755,32 +2755,32 @@ radio:not(:hover):focus {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
-popover modelbutton.flat check, popover modelbutton.flat radio {
+popover modelbutton check, popover modelbutton 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 {
+popover modelbutton check, popover modelbutton check:focus, popover modelbutton check:hover, popover modelbutton check:focus:hover, popover modelbutton check:active, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:focus, popover modelbutton radio:hover, popover modelbutton radio:focus:hover, popover modelbutton radio:active, popover modelbutton radio:disabled {
   transition: none;
   box-shadow: none;
   background: none;
   border: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
+popover modelbutton check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton radio: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 {
+popover modelbutton check, popover modelbutton check:hover, popover modelbutton check:disabled, popover modelbutton radio, popover modelbutton radio:hover, popover modelbutton radio:disabled {
   box-shadow: none;
 }
 
-popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
+popover modelbutton check.left:dir(rtl), popover modelbutton radio.left:dir(rtl) {
   margin-left: -12px;
   margin-right: -4px;
 }
 
-popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
+popover modelbutton check.right:dir(ltr), popover modelbutton radio.right:dir(ltr) {
   margin-left: -4px;
   margin-right: -12px;
 }