diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -4532,9 +4532,13 @@ form.comment-inline-form { float: left; } -.notifications { - padding: 2px 7px !important; - margin: 7px -4px -7px 4px !important; +.menu_link_user{ + padding: 10px 8px 8px 8px !important; +} + +.menu_link_notifications { + padding: 4px 4px !important; + margin: 7px 4px 0px 0px !important; text-align: center; color:#888 !important; font-size: 10px; diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -63,20 +63,19 @@ <%def name="usermenu()"> ## USER MENU
  • - - - %if c.rhodecode_user.username != 'default' and c.unread_notifications != -1: - ${c.unread_notifications} - %endif - - - %if c.rhodecode_user.username != 'default': - ${c.rhodecode_user.username} - %else: - ${_('Not logged in')} - %endif - - + + + avatar + + %if c.rhodecode_user.username != 'default': + ${c.rhodecode_user.username} + %if c.unread_notifications != 0: + ${c.unread_notifications} + %endif + %else: + ${_('Not logged in')} + %endif +