From: Tom Hughes <tom@compton.nu>
Date: Wed, 10 Apr 2024 17:32:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4667'
X-Git-Tag: live~672
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/90089d6c6c0a3971441b6a130ee6036a24d99df1

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

90089d6c6c0a3971441b6a130ee6036a24d99df1
diff --cc app/views/layouts/_header.html.erb
index 13a4aa65e,f61d0806f..eeed7de42
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@@ -81,8 -81,8 +81,8 @@@
      </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-white text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
+         <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'>
 -          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1") %>
 +          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
            <%= render :partial => "layouts/inbox" %>
            <span class="user-button">
              <span class='username'>