From 2193c0ec48eeb950f04b24a601df887e785d2093 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Tue, 25 Oct 2022 18:18:50 +0800
Subject: [PATCH] update

---
 src/gnome-shell/sass/_extensions-40-0.scss    |  6 +-
 .../sass/widgets/_popovers-42.scss            | 68 ++++++++++---------
 .../sass/widgets/_quick-settings.scss         |  3 +-
 .../shell-40-0/gnome-shell-Compact.css        |  6 ++
 .../shell-40-0/gnome-shell-Dark-Compact.css   |  6 ++
 .../shell-40-0/gnome-shell-Dark.css           |  6 ++
 src/gnome-shell/shell-40-0/gnome-shell.css    |  6 ++
 .../shell-42-0/gnome-shell-Compact.css        | 23 ++++---
 .../shell-42-0/gnome-shell-Dark-Compact.css   | 23 ++++---
 .../shell-42-0/gnome-shell-Dark.css           | 23 ++++---
 src/gnome-shell/shell-42-0/gnome-shell.css    | 23 ++++---
 11 files changed, 126 insertions(+), 67 deletions(-)

diff --git a/src/gnome-shell/sass/_extensions-40-0.scss b/src/gnome-shell/sass/_extensions-40-0.scss
index 487b1a8..6b0e31f 100644
--- a/src/gnome-shell/sass/_extensions-40-0.scss
+++ b/src/gnome-shell/sass/_extensions-40-0.scss
@@ -340,7 +340,11 @@
 //
 // Arcmenu
 //
-
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: $circular_radius !important;
+}
 
 //
 // Pop_OS cosmic widget styling
diff --git a/src/gnome-shell/sass/widgets/_popovers-42.scss b/src/gnome-shell/sass/widgets/_popovers-42.scss
index e3110b4..c17a87a 100644
--- a/src/gnome-shell/sass/widgets/_popovers-42.scss
+++ b/src/gnome-shell/sass/widgets/_popovers-42.scss
@@ -7,7 +7,7 @@
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
   -arrow-base: $container_padding * 2;
-  -arrow-rise: $container_padding;
+  -arrow-rise: $container_padding / 2;
   -arrow-box-shadow: none; //dreaming. bug #689995
   background: transparent; // needs to reset?
 }
@@ -23,15 +23,15 @@
 
   .popup-menu-content {
     padding: $container_padding;
-    margin: 0 $container_padding / 2 $container_padding / 2;
+    margin: 0 6px 14px;
     background-color: $menu_bg_color;
     border-radius: $popup_radius;
     border: none;
-    box-shadow: 0 3px 8px rgba(black, 0.2);
+    box-shadow: 0 3px 8px -3px rgba(black, 0.2);
   }
-  
+
   $submenu_item_radius: $popup_radius - $container_padding;
-  
+
   // menu items
   .popup-menu-item {
     spacing: $container_padding;
@@ -41,10 +41,10 @@
     border-radius: if($corner-style == 'circular', $circular_radius, $submenu_item_radius);
     background-image: none;
     border: none;
-  
+
     &:ltr { padding-right: $container_padding * 2; padding-left: 0; }
     &:rtl { padding-right: 0; padding-left: $container_padding * 2; }
-  
+
     &:checked {
       background-color: if($variant == 'light', rgba(black, 0.10), rgba(white, 0.95)) !important;
       color: rgba(black, 0.75) !important;
@@ -52,57 +52,57 @@
       border-radius: $submenu_item_radius $submenu_item_radius 0 0;
       border: none;
       box-shadow: none;
-  
+
       &:hover, &:focus, &.selected {
         background-color: if($variant == 'light', rgba(black, 0.2), #e5e5e5) !important;
         color: rgba(black, 0.85) !important;
       }
-  
+
       &:active {
         background-color: #dfdfdf !important;
         color: rgba(black, 0.75) !important;
       }
-  
+
       &.selected:active {
         background-color: if($variant == 'light', rgba(black, 0.15), #e0e0e0) !important;
         color: rgba(black, 0.75) !important;
       }
-  
+
       &:insensitive { color: rgba(black, 0.35) !important; }
     }
-  
+
     &:hover, &:focus, &.selected {
       background-color: $divider_color !important;
       color: $fg_color !important;
       transition-duration: 0ms;
     }
-  
+
     &:active {
       background-color: $track_color !important;
       color: $fg_color !important;
       transition-duration: $longer_duration;
     }
-  
+
     &.selected:active { color: $fg_color !important; }
     &:insensitive { color: $disabled_fg_color !important; }
   }
-  
+
   // all icons and other graphical elements
   .popup-inactive-menu-item {
     color: $fg_color !important;
-  
+
     &.selected:active {
       background-color: if($variant == 'light', rgba(black, 0.15), #e0e0e0) !important;
       color: rgba(black, 0.75) !important;
     }
-  
+
     &:insensitive { color: $hint_fg_color !important; }
   }
-  
+
   // symbolic icons in popover
   .popup-menu-arrow,
   .popup-menu-icon { icon-size: 16px; }
-  
+
   // popover submenus
   .popup-sub-menu {
     margin: 0;
@@ -112,50 +112,50 @@
     border: none;
     box-shadow: none;
     background-image: none;
-  
+
     .popup-menu-item {
       margin: 0;
       border-radius: $submenu_item_radius;
       color: rgba(black, 0.75) !important;
       background-image: none;
-  
+
       &:hover, &:focus, &.selected {
         color: rgba(black, 0.85) !important;
         background-color: rgba(black, 0.15) !important;
       }
-  
+
       &:active {
         color: rgba(black, 0.85) !important;
         background-color: rgba(black, 0.2) !important;
       }
-  
+
       &.selected:active { color: rgba(black, 0.75) !important; }
-  
+
       &:insensitive { color: rgba(black, 0.35) !important; }
     }
-  
+
     @extend %scrollbar_on_light;
   }
-  
+
   // container for radio and check boxes
   .popup-menu-ornament {
     width: 1.2em;
     text-align: center !important;
-  
+
     &:ltr { text-align: right; }
     &:rtl { text-align: left; }
   }
-  
+
   // separator
   .popup-separator-menu-item {
     background: none;
     border: none;
-  
+
     .popup-separator-menu-item-separator {
       height: 1px; //not really the whole box
       margin: $container_padding $container_padding * 8;
       background-color: $border_color;
-  
+
       .popup-sub-menu & { //submenu separators
         margin: $container_padding $container_padding * 9 $container_padding $container_padding * 4;
         background-color: rgba(black, 0.10);
@@ -221,9 +221,11 @@
   .popup-inactive-menu-item:first-child {
     // "Open Windows" label
     > StLabel {
-      @include font(body-2);
-      &:ltr { margin-right: $container_margin * 2; }
-      &:rtl { margin-left: $container_margin * 2; }
+      font-weight: bold;
+      font-size: $root-font-size;
+
+      &:ltr { margin-right: 0; }
+      &:rtl { margin-left: 0; }
     }
 
     .popup-separator-menu-item-separator {
diff --git a/src/gnome-shell/sass/widgets/_quick-settings.scss b/src/gnome-shell/sass/widgets/_quick-settings.scss
index a8027da..8bb696d 100644
--- a/src/gnome-shell/sass/widgets/_quick-settings.scss
+++ b/src/gnome-shell/sass/widgets/_quick-settings.scss
@@ -1,7 +1,8 @@
 .quick-settings {
   padding: $container_padding * 3 !important;
   border-radius: 20px + $container_padding * 3 !important;
-  margin-top: $container_padding / 2;
+  margin-top: $container_padding / 2 !important;
+  border: none;
 
   .icon-button, .button {
     padding: 12px;
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
index dc99481..bacb5bd 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@@ -3796,6 +3796,12 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.85);
 }
 
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: 9999px !important;
+}
+
 .cosmic-solid-bg {
   background-color: #222222;
 }
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
index 234669d..9c63a0c 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
@@ -3796,6 +3796,12 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.85);
 }
 
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: 9999px !important;
+}
+
 .cosmic-solid-bg {
   background-color: #222222;
 }
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
index 068893a..a25ca0b 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -3796,6 +3796,12 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.85);
 }
 
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: 9999px !important;
+}
+
 .cosmic-solid-bg {
   background-color: #222222;
 }
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index c7a77f3..d42ff83 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -3796,6 +3796,12 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.85);
 }
 
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: 9999px !important;
+}
+
 .cosmic-solid-bg {
   background-color: #222222;
 }
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
index 5fbc460..39e02a0 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@@ -495,7 +495,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
   -arrow-base: 8px;
-  -arrow-rise: 4px;
+  -arrow-rise: 2px;
   -arrow-box-shadow: none;
   background: transparent;
 }
@@ -511,11 +511,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .popup-menu .popup-menu-content {
   padding: 4px;
-  margin: 0 2px 2px;
+  margin: 0 6px 14px;
   background-color: rgba(255, 255, 255, 0.97);
   border-radius: 18px;
   border: none;
-  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 3px 8px -3px rgba(0, 0, 0, 0.2);
 }
 
 .popup-menu .popup-menu-item {
@@ -719,16 +719,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel {
-  font-size: 9.75pt;
-  font-weight: 500;
+  font-weight: bold;
+  font-size: 13px;
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel:ltr {
-  margin-right: 4px;
+  margin-right: 0;
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel:rtl {
-  margin-left: 4px;
+  margin-left: 0;
 }
 
 .app-menu .popup-inactive-menu-item:first-child .popup-separator-menu-item-separator {
@@ -1396,7 +1396,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .quick-settings {
   padding: 12px !important;
   border-radius: 32px !important;
-  margin-top: 2px;
+  margin-top: 2px !important;
+  border: none;
 }
 
 .quick-settings .icon-button, .quick-settings .button {
@@ -4347,6 +4348,12 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.85);
 }
 
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: 9999px !important;
+}
+
 .cosmic-solid-bg {
   background-color: #222222;
 }
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
index e6ef96d..9437bb1 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
@@ -495,7 +495,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
   -arrow-base: 8px;
-  -arrow-rise: 4px;
+  -arrow-rise: 2px;
   -arrow-box-shadow: none;
   background: transparent;
 }
@@ -511,11 +511,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .popup-menu .popup-menu-content {
   padding: 4px;
-  margin: 0 2px 2px;
+  margin: 0 6px 14px;
   background-color: rgba(32, 32, 32, 0.97);
   border-radius: 18px;
   border: none;
-  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 3px 8px -3px rgba(0, 0, 0, 0.2);
 }
 
 .popup-menu .popup-menu-item {
@@ -719,16 +719,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel {
-  font-size: 9.75pt;
-  font-weight: 500;
+  font-weight: bold;
+  font-size: 13px;
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel:ltr {
-  margin-right: 4px;
+  margin-right: 0;
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel:rtl {
-  margin-left: 4px;
+  margin-left: 0;
 }
 
 .app-menu .popup-inactive-menu-item:first-child .popup-separator-menu-item-separator {
@@ -1396,7 +1396,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .quick-settings {
   padding: 12px !important;
   border-radius: 32px !important;
-  margin-top: 2px;
+  margin-top: 2px !important;
+  border: none;
 }
 
 .quick-settings .icon-button, .quick-settings .button {
@@ -4351,6 +4352,12 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.85);
 }
 
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: 9999px !important;
+}
+
 .cosmic-solid-bg {
   background-color: #222222;
 }
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
index 3959444..f5cc826 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -495,7 +495,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
   -arrow-base: 12px;
-  -arrow-rise: 6px;
+  -arrow-rise: 3px;
   -arrow-box-shadow: none;
   background: transparent;
 }
@@ -511,11 +511,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .popup-menu .popup-menu-content {
   padding: 6px;
-  margin: 0 3px 3px;
+  margin: 0 6px 14px;
   background-color: rgba(32, 32, 32, 0.97);
   border-radius: 20px;
   border: none;
-  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 3px 8px -3px rgba(0, 0, 0, 0.2);
 }
 
 .popup-menu .popup-menu-item {
@@ -719,16 +719,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel {
-  font-size: 10.5pt;
-  font-weight: 500;
+  font-weight: bold;
+  font-size: 14px;
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel:ltr {
-  margin-right: 8px;
+  margin-right: 0;
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel:rtl {
-  margin-left: 8px;
+  margin-left: 0;
 }
 
 .app-menu .popup-inactive-menu-item:first-child .popup-separator-menu-item-separator {
@@ -1396,7 +1396,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .quick-settings {
   padding: 18px !important;
   border-radius: 38px !important;
-  margin-top: 3px;
+  margin-top: 3px !important;
+  border: none;
 }
 
 .quick-settings .icon-button, .quick-settings .button {
@@ -4351,6 +4352,12 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.85);
 }
 
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: 9999px !important;
+}
+
 .cosmic-solid-bg {
   background-color: #222222;
 }
diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css
index edf4415..14cf217 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@@ -495,7 +495,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
   -arrow-base: 12px;
-  -arrow-rise: 6px;
+  -arrow-rise: 3px;
   -arrow-box-shadow: none;
   background: transparent;
 }
@@ -511,11 +511,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .popup-menu .popup-menu-content {
   padding: 6px;
-  margin: 0 3px 3px;
+  margin: 0 6px 14px;
   background-color: rgba(255, 255, 255, 0.97);
   border-radius: 20px;
   border: none;
-  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 3px 8px -3px rgba(0, 0, 0, 0.2);
 }
 
 .popup-menu .popup-menu-item {
@@ -719,16 +719,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel {
-  font-size: 10.5pt;
-  font-weight: 500;
+  font-weight: bold;
+  font-size: 14px;
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel:ltr {
-  margin-right: 8px;
+  margin-right: 0;
 }
 
 .app-menu .popup-inactive-menu-item:first-child > StLabel:rtl {
-  margin-left: 8px;
+  margin-left: 0;
 }
 
 .app-menu .popup-inactive-menu-item:first-child .popup-separator-menu-item-separator {
@@ -1396,7 +1396,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .quick-settings {
   padding: 18px !important;
   border-radius: 38px !important;
-  margin-top: 3px;
+  margin-top: 3px !important;
+  border: none;
 }
 
 .quick-settings .icon-button, .quick-settings .button {
@@ -4347,6 +4348,12 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.85);
 }
 
+.arcmenu-menu-button,
+.arcmenu-button {
+  border-width: 0 !important;
+  border-radius: 9999px !important;
+}
+
 .cosmic-solid-bg {
   background-color: #222222;
 }