From e37f5082dee6c08091805bddd75e6ded69aa7eb7 Mon Sep 17 00:00:00 2001
From: Aman Agrawal <amanagr@zulip.com>
Date: Wed, 15 Feb 2023 20:02:41 +0000
Subject: [PATCH] recipient_row: Remove message-header-wrapper div.

This div serves no purpose. Just removed the div and shifted
corrected alignment for other divs.
---
 web/templates/recipient_row.hbs | 159 ++++++++++++++++----------------
 1 file changed, 77 insertions(+), 82 deletions(-)

diff --git a/web/templates/recipient_row.hbs b/web/templates/recipient_row.hbs
index 2afcd125d6..d18dd45c01 100644
--- a/web/templates/recipient_row.hbs
+++ b/web/templates/recipient_row.hbs
@@ -1,98 +1,93 @@
 {{#if is_stream}}
 <div class="message_header message_header_stream right_part">
-    <div class="message-header-wrapper">
-        <div class="message-header-contents">
-            {{! stream link }}
-            <a class="message_label_clickable narrows_by_recipient stream_label {{color_class}}"
-              style="background: {{background_color}}; border-left-color: {{background_color}};"
-              href="{{stream_url}}"
-              title="{{t 'Narrow to stream "{display_recipient}"' }}">
-                {{~! Icons for invite-only/web-public streams ~}}
-                {{~#if invite_only ~}}
-                    <i class="fa fa-lock recipient-row-stream-icon" title="{{t 'This is a private stream' }}" aria-label="{{t 'This is a private stream' }}"></i>
-                {{/if}}
+    <div class="message-header-contents">
+        {{! stream link }}
+        <a class="message_label_clickable narrows_by_recipient stream_label {{color_class}}"
+          style="background: {{background_color}}; border-left-color: {{background_color}};"
+          href="{{stream_url}}"
+          title="{{t 'Narrow to stream "{display_recipient}"' }}">
+            {{~! Icons for invite-only/web-public streams ~}}
+            {{~#if invite_only ~}}
+                <i class="fa fa-lock recipient-row-stream-icon" title="{{t 'This is a private stream' }}" aria-label="{{t 'This is a private stream' }}"></i>
+            {{/if}}
 
-                {{~#if is_web_public ~}}
-                    <i class="zulip-icon zulip-icon-globe recipient-row-stream-icon" title="{{t 'This is a web-public stream' }}" aria-label="{{t 'This is a web-public stream' }}"></i>
-                {{/if}}
+            {{~#if is_web_public ~}}
+                <i class="zulip-icon zulip-icon-globe recipient-row-stream-icon" title="{{t 'This is a web-public stream' }}" aria-label="{{t 'This is a web-public stream' }}"></i>
+            {{/if}}
 
-                {{~! Recipient (e.g. stream/topic or topic) ~}}
-                {{~display_recipient~}}
-            </a>
+            {{~! Recipient (e.g. stream/topic or topic) ~}}
+            {{~display_recipient~}}
+        </a>
 
-            {{! hidden narrow icon for copy-pasting }}
-            <span class="copy-paste-text">&gt;</span>
+        {{! hidden narrow icon for copy-pasting }}
+        <span class="copy-paste-text">&gt;</span>
 
-            {{! topic stuff }}
-            <span class="stream_topic">
-                {{! topic link }}
-                <a class="message_label_clickable narrows_by_topic"
-                  href="{{topic_url}}"
-                  title="{{t 'Narrow to stream "{display_recipient}", topic "{topic}"' }}">
-                    {{#if use_match_properties}}
-                        {{{match_topic}}}
-                    {{else}}
-                        {{topic}}
-                    {{/if}}
-                </a>
-            </span>
-            <span class="recipient_bar_controls no-select">
-                <span class="topic_edit hidden-for-spectators">
-                    <span class="topic_edit_form"></span>
-                </span>
-
-                {{! exterior links (e.g. to a trac ticket) }}
-                {{#each topic_links}}
-                    <a href="{{this.url}}" target="_blank" rel="noopener noreferrer" class="no-underline">
-                        <i class="fa fa-external-link-square recipient_bar_icon" data-tippy-content="Open {{this.text}}" aria-label="{{t 'External link' }}"></i>
-                    </a>
-                {{/each}}
-
-                {{! edit topic pencil icon }}
-                {{#if always_visible_topic_edit}}
-                    <i class="fa fa-pencil always_visible_topic_edit recipient_bar_icon hidden-for-spectators" data-tippy-content="{{t 'Edit topic'}}" role="button" tabindex="0" aria-label="{{t 'Edit topic' }}"></i>
-                {{else if on_hover_topic_edit}}
-                    <i class="fa fa-pencil on_hover_topic_edit recipient_bar_icon hidden-for-spectators" data-tippy-content="{{t 'Edit topic'}}" role="button" tabindex="0" aria-label="{{t 'Edit topic' }}"></i>
-                {{/if}}
-
-                {{#if user_can_resolve_topic}}
-                    {{#if topic_is_resolved}}
-                        <i class="fa fa-check on_hover_topic_unresolve recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as unresolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as unresolved' }}"></i>
-                    {{else}}
-                        <i class="fa fa-check on_hover_topic_resolve recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as resolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as resolved' }}"></i>
-                    {{/if}}
-                {{/if}}
-
-                {{#if topic_muted}}
-                    <i class="zulip-icon zulip-icon-mute on_hover_topic_unmute recipient_bar_icon" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}" data-tooltip-template-id="topic-unmute-tooltip-template" role="button" tabindex="0" aria-label="{{t 'Unmute topic' }}"></i>
-                    <template id="topic-unmute-tooltip-template">
-                        {{t "Unmute topic" }}
-                        {{tooltip_hotkey_hints "M"}}
-                    </template>
+        {{! topic stuff }}
+        <span class="stream_topic">
+            {{! topic link }}
+            <a class="message_label_clickable narrows_by_topic"
+              href="{{topic_url}}"
+              title="{{t 'Narrow to stream "{display_recipient}", topic "{topic}"' }}">
+                {{#if use_match_properties}}
+                    {{{match_topic}}}
                 {{else}}
-                    <i class="zulip-icon zulip-icon-mute on_hover_topic_mute recipient_bar_icon hidden-for-spectators" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}" data-tooltip-template-id="topic-mute-tooltip-template" role="button" tabindex="0" aria-label="{{t 'Mute topic' }}"></i>
-                    <template id="topic-mute-tooltip-template">
-                        {{t "Mute topic" }}
-                        {{tooltip_hotkey_hints "M"}}
-                    </template>
+                    {{topic}}
                 {{/if}}
+            </a>
+        </span>
+        <span class="recipient_bar_controls no-select">
+            <span class="topic_edit hidden-for-spectators">
+                <span class="topic_edit_form"></span>
             </span>
-            <span class="recipient_row_date {{#if date_unchanged}}recipient_row_date_unchanged{{/if}}">{{{date}}}</span>
-        </div>
+
+            {{! exterior links (e.g. to a trac ticket) }}
+            {{#each topic_links}}
+                <a href="{{this.url}}" target="_blank" rel="noopener noreferrer" class="no-underline">
+                    <i class="fa fa-external-link-square recipient_bar_icon" data-tippy-content="Open {{this.text}}" aria-label="{{t 'External link' }}"></i>
+                </a>
+            {{/each}}
+
+            {{! edit topic pencil icon }}
+            {{#if always_visible_topic_edit}}
+                <i class="fa fa-pencil always_visible_topic_edit recipient_bar_icon hidden-for-spectators" data-tippy-content="{{t 'Edit topic'}}" role="button" tabindex="0" aria-label="{{t 'Edit topic' }}"></i>
+            {{else if on_hover_topic_edit}}
+                <i class="fa fa-pencil on_hover_topic_edit recipient_bar_icon hidden-for-spectators" data-tippy-content="{{t 'Edit topic'}}" role="button" tabindex="0" aria-label="{{t 'Edit topic' }}"></i>
+            {{/if}}
+
+            {{#if user_can_resolve_topic}}
+                {{#if topic_is_resolved}}
+                    <i class="fa fa-check on_hover_topic_unresolve recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as unresolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as unresolved' }}"></i>
+                {{else}}
+                    <i class="fa fa-check on_hover_topic_resolve recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as resolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as resolved' }}"></i>
+                {{/if}}
+            {{/if}}
+
+            {{#if topic_muted}}
+                <i class="zulip-icon zulip-icon-mute on_hover_topic_unmute recipient_bar_icon" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}" data-tooltip-template-id="topic-unmute-tooltip-template" role="button" tabindex="0" aria-label="{{t 'Unmute topic' }}"></i>
+                <template id="topic-unmute-tooltip-template">
+                    {{t "Unmute topic" }}
+                    {{tooltip_hotkey_hints "M"}}
+                </template>
+            {{else}}
+                <i class="zulip-icon zulip-icon-mute on_hover_topic_mute recipient_bar_icon hidden-for-spectators" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}" data-tooltip-template-id="topic-mute-tooltip-template" role="button" tabindex="0" aria-label="{{t 'Mute topic' }}"></i>
+                <template id="topic-mute-tooltip-template">
+                    {{t "Mute topic" }}
+                    {{tooltip_hotkey_hints "M"}}
+                </template>
+            {{/if}}
+        </span>
+        <span class="recipient_row_date {{#if date_unchanged}}recipient_row_date_unchanged{{/if}}">{{{date}}}</span>
     </div>
 </div>
 {{else}}
 <div class="message_header message_header_private_message dark_background">
-    <div class="message-header-wrapper">
-        <div class="message-header-contents">
-            <a class="message_label_clickable narrows_by_recipient stream_label"
-              href="{{pm_with_url}}"
-              title="{{t 'Narrow to your direct messages with {display_reply_to}' }}">
-                {{t "You and {display_reply_to}" }}
-            </a>
-
-            <span class="recipient_row_date {{#if date_unchanged}}recipient_row_date_unchanged{{/if}}">{{{date}}}</span>
-        </div>
+    <div class="message-header-contents">
+        <a class="message_label_clickable narrows_by_recipient stream_label"
+          href="{{pm_with_url}}"
+          title="{{t 'Narrow to your direct messages with {display_reply_to}' }}">
+            {{t "You and {display_reply_to}" }}
+        </a>
+        <span class="recipient_row_date {{#if date_unchanged}}recipient_row_date_unchanged{{/if}}">{{{date}}}</span>
     </div>
 </div>
 {{/if}}