From 3a99c10a7d3bc480fbb5596c7f301748b2bde535 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 28 Apr 2024 23:56:43 +0800
Subject: [PATCH] Fixed issues

---
 src/sass/gtk/_common-3.0.scss     | 49 +++++++++++++++++--------------
 src/sass/gtk/apps/_gnome-3.0.scss |  8 +++--
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 721a2592..81e8939d 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -717,25 +717,6 @@ button {
   &:dir(rtl) { background-position: left 3px; }
 }
 
-// menu buttons
-modelbutton.flat,
-.menuitem.button.flat {
-  min-height: $menuitem-size;
-  padding: 0 8px;
-  border-radius: $corner-radius;
-  color: $text;
-
-  @extend %button-flat-simple;
-
-  &:selected { @extend %selected_items; }
-}
-
-modelbutton.flat arrow {
-  &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
-
-  &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-}
-
 button.color {
   min-height: $small-size;
   min-width: $small-size;
@@ -1828,7 +1809,7 @@ popover.background {
     }
   }
 
-  > stack { margin: 0; } // remove extra padding from menu style popovers
+  > stack { margin: -4px; } // remove extra padding from menu style popovers
 
   > toolbar { margin: 0; }
 
@@ -1873,6 +1854,28 @@ popover.background {
     // &:checked { color: $primary; }
   }
 
+  // menu buttons
+  modelbutton.flat,
+  .menuitem.button.flat {
+    min-height: $menuitem-size;
+    padding: 0 8px;
+    border-radius: $corner-radius;
+    color: $text;
+    @extend %button-flat-simple;
+
+    &:selected { @extend %selected_items; }
+  }
+
+  modelbutton.flat + modelbutton.flat,
+  modelbutton.flat + box.vertical,
+  .menuitem.button.flat + .menuitem.button.flat { margin-top: 2px; }
+
+  modelbutton.flat arrow {
+    &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+
+    &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+  }
+
   separator { margin: $space-size / 2 0; }
 
   list separator { margin: 0; }
@@ -3278,6 +3281,8 @@ stacksidebar.sidebar {
     padding: 0 $space-size / 2;
     border-radius: $corner-radius;
 
+    + row { margin-top: $space-size / 2; }
+
     &:selected {
       background-color: $primary;
       color: on($primary);
@@ -3288,8 +3293,6 @@ stacksidebar.sidebar {
       }
     }
 
-    + row { margin-top: $space-size / 2; }
-
     > label {
       padding-left: $space-size;
       padding-right: $space-size;
@@ -3332,6 +3335,8 @@ placessidebar.sidebar {
     padding: 0;
     border-radius: $corner-radius;
 
+    + row { margin-top: $space-size / 2; }
+
     // Using margins/padding directly in the SidebarRow
     // will make the animation of the new bookmark row jump
     > revealer { padding: 0 8px 0 16px; }
diff --git a/src/sass/gtk/apps/_gnome-3.0.scss b/src/sass/gtk/apps/_gnome-3.0.scss
index 95b26a07..8c19d50c 100644
--- a/src/sass/gtk/apps/_gnome-3.0.scss
+++ b/src/sass/gtk/apps/_gnome-3.0.scss
@@ -469,6 +469,8 @@ frame.gedit-map-frame > border {
 leaflet list.navigation-sidebar {
   background-color: $base-alt;
 
+  > row + row { margin-top: $space-size / 2; }
+
   window.background.csd:not(.maximized) & {
     border-bottom-left-radius: $window-radius;
   }
@@ -588,11 +590,13 @@ window.background.csd {
 
         list { // left-pane
           background-color: transparent;
-          padding: $space-size / 2;
+          padding: $space-size;
 
-          row.activatable {
+          > row.activatable {
             border-radius: $corner-radius;
 
+            + row { margin-top: $space-size / 2; }
+
             &:not(:hover):not(:active):not(:selected) {
               background-color: transparent;
             }