summaryrefslogtreecommitdiff
path: root/app/views/layouts/header/_current_user_dropdown.html.haml
diff options
context:
space:
mode:
authorDennis Tang <dennis@dennistang.net>2018-10-19 12:28:52 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2018-10-19 12:28:52 +0000
commitf8c55c7d0f3ff9d926ad6a06a993a0c140fd04fb (patch)
tree65f7a538e9820e3653e1b38b6c2cb2bc5653bb67 /app/views/layouts/header/_current_user_dropdown.html.haml
parent6b70b772ae48ec08df80096275641d05135b3df1 (diff)
downloadgitlab-ce-f8c55c7d0f3ff9d926ad6a06a993a0c140fd04fb.tar.gz
Adjust size and alignment of emojis of user status in user menu
Diffstat (limited to 'app/views/layouts/header/_current_user_dropdown.html.haml')
-rw-r--r--app/views/layouts/header/_current_user_dropdown.html.haml8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml
index 648124d3870..4f3e4031fe3 100644
--- a/app/views/layouts/header/_current_user_dropdown.html.haml
+++ b/app/views/layouts/header/_current_user_dropdown.html.haml
@@ -6,9 +6,11 @@
= current_user.name
= current_user.to_reference
- if current_user.status
- .user-status-emoji.str-truncated.has-tooltip{ title: current_user.status.message_html, data: { html: 'true', placement: 'bottom' } }
- = emoji_icon current_user.status.emoji
- = current_user.status.message_html.html_safe
+ .user-status.d-flex.align-items-center.prepend-top-2.has-tooltip{ title: current_user.status.message_html, data: { html: 'true', placement: 'bottom' } }
+ %span.user-status-emoji.d-flex.align-items-center
+ = emoji_icon current_user.status.emoji
+ %span.user-status-message.str-truncated
+ = current_user.status.message_html.html_safe
%li.divider
- if can?(current_user, :update_user_status, current_user)
%li