From 50c744db4846e1927c81ee103868053f1d4ebd5a Mon Sep 17 00:00:00 2001
From: Karl Stolley <karl@zulip.com>
Date: Fri, 3 May 2024 12:55:14 -0500
Subject: [PATCH] left_sidebar: Apply grid to 'more conversations' DM row.

---
 web/styles/left_sidebar.css | 13 ++++---------
 web/templates/more_pms.hbs  | 10 ++++------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/web/styles/left_sidebar.css b/web/styles/left_sidebar.css
index 5413239718..f58793cad8 100644
--- a/web/styles/left_sidebar.css
+++ b/web/styles/left_sidebar.css
@@ -305,15 +305,6 @@ li.show-more-topics {
 
         & li#show-more-direct-messages {
             cursor: pointer;
-            padding-right: 26px;
-            /* TODO: Rewrite the show-more and show-less
-               buttons as grids alongside the left sidebar
-               header rewrites. This padding value
-               is a stopgap to provide the same lefthand
-               alignment as the "more topics" text, which
-               aligns with the topic above--just as this
-               aligns with the DM row above. */
-            padding-left: 29px;
 
             & a {
                 font-size: 12px;
@@ -1100,6 +1091,10 @@ li.topic-list-item {
         place-self: center;
     }
 
+    .dm-name {
+        grid-area: row-content;
+    }
+
     .user_circle {
         width: 8px;
         height: 8px;
diff --git a/web/templates/more_pms.hbs b/web/templates/more_pms.hbs
index 95fbaffc28..121d8a04b1 100644
--- a/web/templates/more_pms.hbs
+++ b/web/templates/more_pms.hbs
@@ -1,8 +1,6 @@
-<li id="show-more-direct-messages" class="dm-list-item bottom_left_row {{#unless more_conversations_unread_count}}zero-dm-unreads{{/unless}}">
-    <span>
-        <a class="dm-name" tabindex="0">{{t "more conversations" }}</a>
-        <span class="unread_count {{#unless more_conversations_unread_count}}zero_count{{/unless}}">
-            {{more_conversations_unread_count}}
-        </span>
+<li id="show-more-direct-messages" class="dm-list-item dm-box bottom_left_row {{#unless more_conversations_unread_count}}zero-dm-unreads{{/unless}}">
+    <a class="dm-name" tabindex="0">{{t "more conversations" }}</a>
+    <span class="unread_count {{#unless more_conversations_unread_count}}zero_count{{/unless}}">
+        {{more_conversations_unread_count}}
     </span>
 </li>