From 67da4d5a2be58a1e7cb179067e5ebe04566b6063 Mon Sep 17 00:00:00 2001
From: Karl Stolley <karl@zulip.com>
Date: Fri, 28 Mar 2025 14:32:55 -0400
Subject: [PATCH] left_sidebar: Display bot icon, status emoji as inline block.

---
 web/styles/left_sidebar.css    | 18 ++++++------------
 web/templates/pm_list_item.hbs | 11 ++++++-----
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/web/styles/left_sidebar.css b/web/styles/left_sidebar.css
index 0b2c647f90..c3b3016235 100644
--- a/web/styles/left_sidebar.css
+++ b/web/styles/left_sidebar.css
@@ -271,6 +271,7 @@
 
             .zulip-icon:not(.user-circle) {
                 color: var(--color-left-sidebar-dm-partners-icon);
+                vertical-align: -0.2em;
             }
         }
 
@@ -914,24 +915,17 @@ li.top_left_scheduled_messages {
     grid-area: row-content;
     overflow: hidden;
     text-overflow: ellipsis;
-    /* Use an inline grid to provide a modern layout
-       for status emoji in DM rows, while preserving
-       the expected ellipsis behavior on long usernames
-       or large DM groups.
-       The 16px-tall emoji will also align well
-       vertically with the 18px line-height here. */
-    display: inline-grid;
-    /* Provide a two-column grid, sized to accommodate
-       the content of the conversation list and status
-       emoji, if any. */
-    grid-template-columns: repeat(2, minmax(0, max-content));
-    align-items: center;
 }
 
 .conversation-partners .status-emoji {
     /* Prevent status emoji from colliding
        with unread counts. */
     margin-right: 3px;
+    /* To make status emoji look good with
+       multiline usernames, we need to fall
+       back to inline-block display here. */
+    display: inline-block;
+    vertical-align: -0.25em;
 }
 
 /* New grid definitions here. */
diff --git a/web/templates/pm_list_item.hbs b/web/templates/pm_list_item.hbs
index 2973a72ebc..68f0c6090e 100644
--- a/web/templates/pm_list_item.hbs
+++ b/web/templates/pm_list_item.hbs
@@ -8,11 +8,12 @@
         {{/if}}
 
         <a href="{{url}}" class="conversation-partners">
-            <span class="conversation-partners-list">{{recipients}}</span>
-            {{> status_emoji status_emoji_info}}
-            {{#if is_bot}}
-                <i class="zulip-icon zulip-icon-bot" aria-label="{{t 'Bot' }}"></i>
-            {{/if}}
+            <span class="conversation-partners-list">{{recipients}} {{> status_emoji status_emoji_info}}
+                {{#if is_bot}}
+                    <i class="zulip-icon zulip-icon-bot" aria-label="{{t 'Bot' }}"></i>
+                {{/if}}
+            </span>
+
         </a>
         <div class="dm-markers-and-unreads">
             {{#if has_unread_mention}}