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

[rails.git] / app / views / layouts / _inbox.html.erb

diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb
index 6dd6218eecb9434bd359f1de63044ccef8e95072..2f5a63753b0bb7e249e9786576915059aaf3813b 100644 (file)
--- a/app/views/layouts/_inbox.html.erb
+++ b/app/views/layouts/_inbox.html.erb
@@ -1,3 +1,3 @@
-<span id="inboxanchor" class="count-number">
-  <img src='<%= user_image_url(@user, :size => 20) %>'><span><%= @user.new_messages.size %></span>
-</span>
\ No newline at end of file
+<% if current_user.new_messages.size > 0 %>
+<span id="inboxanchor" class="badge count-number m-1"><%= current_user.new_messages.size %></span>
+<% end %>