From 1bce38c8ce16ba618470228ec73ae664ff0c2106 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Sat, 2 Apr 2022 15:16:39 +0800
Subject: [PATCH] Fixed #45

---
 src/main/gnome-shell/shell-3-28/gnome-shell-dark.css  | 4 ++--
 src/main/gnome-shell/shell-3-28/gnome-shell-light.css | 4 ++--
 src/main/gnome-shell/shell-3-28/gnome-shell.css       | 4 ++--
 src/main/gnome-shell/shell-40-0/gnome-shell-dark.css  | 4 ++--
 src/main/gnome-shell/shell-40-0/gnome-shell-light.css | 4 ++--
 src/main/gnome-shell/shell-40-0/gnome-shell.css       | 4 ++--
 src/main/gtk-3.0/gtk-dark.css                         | 1 -
 src/main/gtk-3.0/gtk-light.css                        | 1 -
 src/main/gtk-3.0/gtk.css                              | 1 -
 src/sass/gnome-shell/common/_popovers.scss            | 8 ++++----
 src/sass/gtk/_common-3.0.scss                         | 2 +-
 11 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
index 6fe0be22..605f1add 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
@@ -2338,7 +2338,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
-  -arrow-base: 64px;
+  -arrow-base: 12px;
   -arrow-rise: 6px;
   -arrow-box-shadow: none;
   background: transparent;
@@ -2367,7 +2367,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 9px;
+  spacing: 6px;
   padding: 6px 0;
   color: rgba(255, 255, 255, 0.7);
   text-shadow: none;
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light.css b/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
index c32a0c57..edf8d7aa 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
@@ -2338,7 +2338,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
-  -arrow-base: 64px;
+  -arrow-base: 12px;
   -arrow-rise: 6px;
   -arrow-box-shadow: none;
   background: transparent;
@@ -2367,7 +2367,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 9px;
+  spacing: 6px;
   padding: 6px 0;
   color: rgba(0, 0, 0, 0.6);
   text-shadow: none;
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell.css b/src/main/gnome-shell/shell-3-28/gnome-shell.css
index f724506a..fa4593ae 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell.css
@@ -2338,7 +2338,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
-  -arrow-base: 64px;
+  -arrow-base: 12px;
   -arrow-rise: 6px;
   -arrow-box-shadow: none;
   background: transparent;
@@ -2367,7 +2367,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 9px;
+  spacing: 6px;
   padding: 6px 0;
   color: rgba(0, 0, 0, 0.6);
   text-shadow: none;
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
index f92d014a..dd7259f7 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
@@ -2338,7 +2338,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
-  -arrow-base: 64px;
+  -arrow-base: 12px;
   -arrow-rise: 6px;
   -arrow-box-shadow: none;
   background: transparent;
@@ -2367,7 +2367,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 9px;
+  spacing: 6px;
   padding: 6px 0;
   color: rgba(255, 255, 255, 0.7);
   text-shadow: none;
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light.css b/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
index 1c808e25..5d0eb324 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
@@ -2338,7 +2338,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
-  -arrow-base: 64px;
+  -arrow-base: 12px;
   -arrow-rise: 6px;
   -arrow-box-shadow: none;
   background: transparent;
@@ -2367,7 +2367,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 9px;
+  spacing: 6px;
   padding: 6px 0;
   color: rgba(0, 0, 0, 0.6);
   text-shadow: none;
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell.css b/src/main/gnome-shell/shell-40-0/gnome-shell.css
index 17f41904..8b3130cf 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell.css
@@ -2338,7 +2338,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
-  -arrow-base: 64px;
+  -arrow-base: 12px;
   -arrow-rise: 6px;
   -arrow-box-shadow: none;
   background: transparent;
@@ -2367,7 +2367,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .popup-menu .popup-menu-item {
-  spacing: 9px;
+  spacing: 6px;
   padding: 6px 0;
   color: rgba(0, 0, 0, 0.6);
   text-shadow: none;
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index a209c792..5ba910c5 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -4228,7 +4228,6 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
 stackswitcher {
   min-height: 0;
   padding: 3px;
-  margin: 6px 0;
   border-radius: 9px;
   background-color: rgba(255, 255, 255, 0.04);
   border: none;
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 839f286e..92a8494f 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -4219,7 +4219,6 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
 stackswitcher {
   min-height: 0;
   padding: 3px;
-  margin: 6px 0;
   border-radius: 9px;
   background-color: rgba(0, 0, 0, 0.04);
   border: none;
diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css
index a380522c..9d5ba032 100644
--- a/src/main/gtk-3.0/gtk.css
+++ b/src/main/gtk-3.0/gtk.css
@@ -4228,7 +4228,6 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
 stackswitcher {
   min-height: 0;
   padding: 3px;
-  margin: 6px 0;
   border-radius: 9px;
   background-color: rgba(0, 0, 0, 0.04);
   border: none;
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index d6d68162..2c0442e3 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -6,8 +6,8 @@
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 6px;
+  -arrow-base: $base_padding * 2;
+  -arrow-rise: $base_padding;
   -arrow-box-shadow: none; //dreaming. bug #689995
   background: transparent; // needs to reset?
   box-shadow: none;
@@ -21,7 +21,7 @@
   font-weight: normal;
   border-radius: $menu_radius;
   box-shadow: 0 3px 6px rgba(black, 0.08);
-  margin: 0 3px;
+  margin: 0 $base_padding / 2;
   @include fontsize($font_size - 1);
 
   .popup-menu-content {
@@ -38,7 +38,7 @@
   }
 
   .popup-menu-item {
-    spacing: $base_spacing * 1.5;
+    spacing: $base_spacing;
     padding: $base_padding 0;
     color: $text-secondary;
     text-shadow: none;
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 45db7afe..3b40371b 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -3955,7 +3955,7 @@ cursor-handle {
 stackswitcher {
   min-height: 0;
   padding: $space-size / 2;
-  margin: $space-size 0;
+  // margin: $space-size 0;
   border-radius: $corner-radius + $space-size / 2;
   background-color: $fill;
   border: none;