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

openstreetmap · May 21, 2024 · 56a34d8 · 56a34d8
2 parents 89cac21 + 11f04bd
commit 56a34d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -83,7 +83,9 @@
       <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'>
           <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
-          <%= render :partial => "layouts/inbox" %>
+          <% if current_user.new_messages.size > 0 %>
+            <span class="badge count-number m-1"><%= current_user.new_messages.size %></span>
+          <% end %>
           <span class="user-button">
             <span class='username'>
               <%= current_user.display_name %>

diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb