Merge remote-tracking branch 'upstream/pull/4822'
This commit is contained in:
commit
56a34d85cc
2 changed files with 3 additions and 4 deletions
|
@ -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 %>
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
<% if current_user.new_messages.size > 0 %>
|
||||
<span id="inboxanchor" class="badge count-number m-1"><%= current_user.new_messages.size %></span>
|
||||
<% end %>
|
Loading…
Add table
Add a link
Reference in a new issue