From 86a0622b00595a1338a9c2fc20c16ea61f2d4311 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Thu, 26 Oct 2023 21:09:37 +0800
Subject: [PATCH] update

---
 src/sass/gtk/apps/_budgie.scss     | 60 ++++++++++++++++--------------
 src/sass/gtk/apps/_libadwaita.scss |  1 -
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss
index e78505cc..f55f18f8 100644
--- a/src/sass/gtk/apps/_budgie.scss
+++ b/src/sass/gtk/apps/_budgie.scss
@@ -63,7 +63,7 @@ dialog.background {
 
   list, row { padding: 0; }
 
-  separator { margin: $space-size / 2 0; }
+  separator.horizontal { margin: $space-size / 2 0; }
 
   border { border: none; }
 
@@ -80,13 +80,35 @@ dialog.background {
 
   // AppMenu (Elementary)
   scrolledwindow.sidebar:not(.categories) {
-    background-color: $fill;
+    background: none;
     border-right: none;
-    border-bottom-left-radius: $menu-radius;
 
-    list > row.activatable {
-      @extend %row_activatable;
-      padding: $space-size ($space-size + 2px);
+    list {
+      background-color: $fill;
+      border-radius: $corner-radius / 2;
+      padding: $space-size / 2 0;
+
+      > row.activatable {
+        @extend %row_activatable;
+        padding: $space-size ($space-size + 2px);
+      }
+    }
+  }
+
+  scrolledwindow.sidebar + separator {
+    margin: 0;
+    background-color: transparent;
+    min-width: 0;
+    min-height: 0;
+  }
+
+  scrolledwindow.sidebar + separator + scrolledwindow {
+    margin-left: $space-size / 2;
+
+    list {
+      > row.activatable {
+        border-radius: $corner-radius / 2;
+      }
     }
   }
 
@@ -98,25 +120,6 @@ dialog.background {
     &:selected { background-color: $overlay-active; }
   }
 
-  &.bottom scrolledwindow.sidebar:not(.categories) {
-    padding-top: $menu-radius;
-    border-top-left-radius: $menu-radius;
-    border-bottom-left-radius: 0;
-  }
-
-  > frame.container > grid.horizontal > grid.horizontal {
-    > widget > grid.horizontal > stack {
-      border-top: 1px solid $divider;
-    }
-  }
-
-  &.bottom > frame.container > grid.horizontal > grid.horizontal {
-    > widget > grid.horizontal > stack {
-      border-top: none;
-      border-bottom: 1px solid $divider;
-    }
-  }
-
   &.budgie-menu { // Budgie AppMenu
     .container { padding: 0; }
 
@@ -220,9 +223,10 @@ dialog.background {
     }
   }
 
-  // &.sound-popover {
-  //   separator { margin: $space-size / 2 0; }
-  // }
+  &.sound-popover {
+    .container { padding: 0; }
+    separator { margin: $space-size / 2 0; }
+  }
 
   // &.caffeine-popover {
   // }
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index 4cfa14b1..011aed6a 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -747,7 +747,6 @@ $sidebar-backdrop: if($topbar == 'dark' and $variant == 'light', $titlebar-backd
   }
 }
 
-
 // ThemeSelector
 themeselector, // Gnome text editor
 panelthemeselector { // Gnome builder