From b561f4ee4f722ecf4282e988b650ec661f3f2c68 Mon Sep 17 00:00:00 2001
From: Karl Stolley <karl@zulip.com>
Date: Fri, 15 Aug 2025 11:54:50 -0500
Subject: [PATCH] sidebars: Bring left, right sidebar tops into concord.

(cherry picked from commit b3fb672b5dbd2952cf00d31bcb7ca103a36be99b)
---
 web/styles/left_sidebar.css  | 2 +-
 web/styles/right_sidebar.css | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/web/styles/left_sidebar.css b/web/styles/left_sidebar.css
index 1a4893ebb8..81a91ccaae 100644
--- a/web/styles/left_sidebar.css
+++ b/web/styles/left_sidebar.css
@@ -352,7 +352,7 @@
     top: 0;
     background: var(--color-background);
     /* Must be padding not margin so that the sticky headers don't show behind it */
-    padding: 0 var(--left-sidebar-right-margin) 3px 5px;
+    padding: 0 var(--left-sidebar-right-margin) 0 5px;
 
     .channel-folders-sidebar-menu-icon {
         grid-area: channel-folders-option;
diff --git a/web/styles/right_sidebar.css b/web/styles/right_sidebar.css
index d30d3d88fb..b0609ffdb1 100644
--- a/web/styles/right_sidebar.css
+++ b/web/styles/right_sidebar.css
@@ -505,10 +505,7 @@
     cursor: pointer;
     display: grid;
     gap: 5px;
-    grid-template-rows: var(--line-height-sidebar-row-prominent);
     grid-template-columns: minmax(0, 1fr) auto;
-    align-items: center;
-    padding-bottom: 10px;
     padding-left: var(--right-sidebar-heading-left-spacing);
     /* The scrollbar doesn't extend this high, but we want the three-dot
        menus to line up. */
@@ -518,11 +515,12 @@
     #buddy-list-menu-icon {
         color: var(--color-vdots-visible);
         width: var(--right-sidebar-vdots-width);
-        /* Match the height of the buddy list filter input */
-        height: 100%;
         /* Push back against default right-sidebar
            spacing for better vdots alignment. */
         padding: 0;
+        /* No left/right margin to maintain vdots
+           alignment with user rows below. */
+        margin: 2px 0;
 
         &:hover {
             color: var(--color-vdots-hover);