From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 May 2024 14:11:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4842'
X-Git-Tag: live~476
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a90302aecf579ca29fa5ea0b1e9d03f81b8bbde4?ds=sidebyside

Merge remote-tracking branch 'upstream/pull/4842'
---

a90302aecf579ca29fa5ea0b1e9d03f81b8bbde4
diff --cc app/views/layouts/_header.html.erb
index 95b2c5537,fdabea7cd..77ef647a0
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@@ -81,12 -81,12 +81,12 @@@
      </ul>
      <% if current_user && current_user.id %>
        <div class='d-inline-flex dropdown user-menu logged-in'>
-         <button class='dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
+         <button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
            <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
            <% if current_user.new_messages.size > 0 %>
 -            <span class="badge count-number position-static"><%= current_user.new_messages.size %></span>
 +            <span class="badge count-number position-static m-1"><%= current_user.new_messages.size %></span>
            <% end %>
-           <span class='username align-middle'>
 -          <span class='username text-truncate'>
++          <span class='username align-middle text-truncate'>
              <%= current_user.display_name %>
            </span>
          </button>