From 13e3a51eb3057e3e36964c430845c3e32f6b8a11 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Wed, 18 Jan 2023 11:44:48 +0800
Subject: [PATCH] update

---
 src/_sass/gnome-shell/widgets/_dash.scss                | 7 +++----
 src/_sass/gnome-shell/widgets/_popovers.scss            | 2 +-
 src/gnome-shell/shell-40-0/gnome-shell-Compact.css      | 7 +++----
 src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css | 7 +++----
 src/gnome-shell/shell-40-0/gnome-shell-Dark.css         | 7 +++----
 src/gnome-shell/shell-40-0/gnome-shell.css              | 7 +++----
 src/gnome-shell/shell-42-0/gnome-shell-Compact.css      | 7 +++----
 src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css | 7 +++----
 src/gnome-shell/shell-42-0/gnome-shell-Dark.css         | 7 +++----
 src/gnome-shell/shell-42-0/gnome-shell.css              | 7 +++----
 10 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/src/_sass/gnome-shell/widgets/_dash.scss b/src/_sass/gnome-shell/widgets/_dash.scss
index ecc8d23..e502e0b 100644
--- a/src/_sass/gnome-shell/widgets/_dash.scss
+++ b/src/_sass/gnome-shell/widgets/_dash.scss
@@ -58,8 +58,7 @@ $dash_border_radius: if($corner_style == 'circular', $circular-radius, $material
 
 .dash-separator {
   width: 1px;
-  margin: 0 $margin-size;
-  margin-bottom: $dash_padding;
+  margin: 0 $margin-size $dash_padding;
   background-color: rgba(white, 0.15);
 }
 
@@ -67,11 +66,11 @@ $dash_border_radius: if($corner_style == 'circular', $circular-radius, $material
 .dash-label {
   border-radius: if($corner_style == 'circular', $circular-radius, $material-radius);
   padding: $space-size $space-size * 2;
-  margin: $margin-size * 2 $margin-size;
   color: on(dark);
   background-color: rgba(black, 0.75);
   border: none;
   box-shadow: $shell-shadow-z2;
   text-align: center;
-  -y-offset: 0; // distance from the dash edge
+  -y-offset: $margin-size * 3; // distance from the dash edge
+  -x-offset: $space-size + 2px;
 }
diff --git a/src/_sass/gnome-shell/widgets/_popovers.scss b/src/_sass/gnome-shell/widgets/_popovers.scss
index c12064c..e4df58b 100644
--- a/src/_sass/gnome-shell/widgets/_popovers.scss
+++ b/src/_sass/gnome-shell/widgets/_popovers.scss
@@ -214,7 +214,7 @@ $submenu_item_radius: $popup-radius - $space-size;
 
   .popup-separator-menu-item-separator {
     height: 1px; // increase visibility with a themed menu
-    margin: 0 0;
+    margin: 0;
     background-color: $border;
 
     .popup-sub-menu & { //submenu separators
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 cf7c78e..f7d333d 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@@ -2357,21 +2357,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .dash-separator {
   width: 1px;
-  margin: 0 2px;
-  margin-bottom: 12px;
+  margin: 0 2px 12px;
   background-color: rgba(255, 255, 255, 0.15);
 }
 
 .dash-label {
   border-radius: 9999px;
   padding: 4px 8px;
-  margin: 4px 2px;
   color: white;
   background-color: rgba(0, 0, 0, 0.75);
   border: none;
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
   text-align: center;
-  -y-offset: 0;
+  -y-offset: 6px;
+  -x-offset: 6px;
 }
 
 /* App Grid */
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 3579f34..a7e76c7 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
@@ -2357,21 +2357,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .dash-separator {
   width: 1px;
-  margin: 0 2px;
-  margin-bottom: 12px;
+  margin: 0 2px 12px;
   background-color: rgba(255, 255, 255, 0.15);
 }
 
 .dash-label {
   border-radius: 9999px;
   padding: 4px 8px;
-  margin: 4px 2px;
   color: white;
   background-color: rgba(0, 0, 0, 0.75);
   border: none;
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
   text-align: center;
-  -y-offset: 0;
+  -y-offset: 6px;
+  -x-offset: 6px;
 }
 
 /* App Grid */
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 8de3744..548b496 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -2357,21 +2357,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .dash-separator {
   width: 1px;
-  margin: 0 4px;
-  margin-bottom: 12px;
+  margin: 0 4px 12px;
   background-color: rgba(255, 255, 255, 0.15);
 }
 
 .dash-label {
   border-radius: 9999px;
   padding: 6px 12px;
-  margin: 8px 4px;
   color: white;
   background-color: rgba(0, 0, 0, 0.75);
   border: none;
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
   text-align: center;
-  -y-offset: 0;
+  -y-offset: 12px;
+  -x-offset: 8px;
 }
 
 /* App Grid */
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index 8cfc299..116f084 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -2357,21 +2357,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .dash-separator {
   width: 1px;
-  margin: 0 4px;
-  margin-bottom: 12px;
+  margin: 0 4px 12px;
   background-color: rgba(255, 255, 255, 0.15);
 }
 
 .dash-label {
   border-radius: 9999px;
   padding: 6px 12px;
-  margin: 8px 4px;
   color: white;
   background-color: rgba(0, 0, 0, 0.75);
   border: none;
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
   text-align: center;
-  -y-offset: 0;
+  -y-offset: 12px;
+  -x-offset: 8px;
 }
 
 /* App Grid */
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 339e887..447fab9 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@@ -2704,21 +2704,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .dash-separator {
   width: 1px;
-  margin: 0 2px;
-  margin-bottom: 12px;
+  margin: 0 2px 12px;
   background-color: rgba(255, 255, 255, 0.15);
 }
 
 .dash-label {
   border-radius: 9999px;
   padding: 4px 8px;
-  margin: 4px 2px;
   color: white;
   background-color: rgba(0, 0, 0, 0.75);
   border: none;
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
   text-align: center;
-  -y-offset: 0;
+  -y-offset: 6px;
+  -x-offset: 6px;
 }
 
 /* App Grid */
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 9d0a7e4..1abf773 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
@@ -2708,21 +2708,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .dash-separator {
   width: 1px;
-  margin: 0 2px;
-  margin-bottom: 12px;
+  margin: 0 2px 12px;
   background-color: rgba(255, 255, 255, 0.15);
 }
 
 .dash-label {
   border-radius: 9999px;
   padding: 4px 8px;
-  margin: 4px 2px;
   color: white;
   background-color: rgba(0, 0, 0, 0.75);
   border: none;
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
   text-align: center;
-  -y-offset: 0;
+  -y-offset: 6px;
+  -x-offset: 6px;
 }
 
 /* App Grid */
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 8064a14..09e5fc3 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -2708,21 +2708,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .dash-separator {
   width: 1px;
-  margin: 0 4px;
-  margin-bottom: 12px;
+  margin: 0 4px 12px;
   background-color: rgba(255, 255, 255, 0.15);
 }
 
 .dash-label {
   border-radius: 9999px;
   padding: 6px 12px;
-  margin: 8px 4px;
   color: white;
   background-color: rgba(0, 0, 0, 0.75);
   border: none;
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
   text-align: center;
-  -y-offset: 0;
+  -y-offset: 12px;
+  -x-offset: 8px;
 }
 
 /* App Grid */
diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css
index c203304..6a52384 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@@ -2704,21 +2704,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .dash-separator {
   width: 1px;
-  margin: 0 4px;
-  margin-bottom: 12px;
+  margin: 0 4px 12px;
   background-color: rgba(255, 255, 255, 0.15);
 }
 
 .dash-label {
   border-radius: 9999px;
   padding: 6px 12px;
-  margin: 8px 4px;
   color: white;
   background-color: rgba(0, 0, 0, 0.75);
   border: none;
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
   text-align: center;
-  -y-offset: 0;
+  -y-offset: 12px;
+  -x-offset: 8px;
 }
 
 /* App Grid */