Commit ce6a21f7 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '52299-follow-up-from-resolve-add-status-message-from-within-user-menu' into 'master'

Adjust size and alignment of emojis of user status in user menu

Closes #52299

See merge request gitlab-org/gitlab-ce!22194
parents 6b70b772 f8c55c7d
...@@ -530,7 +530,6 @@ ...@@ -530,7 +530,6 @@
.header-user { .header-user {
&.show .dropdown-menu { &.show .dropdown-menu {
max-height: 323px;
margin-top: 4px; margin-top: 4px;
color: $gl-text-color; color: $gl-text-color;
left: auto; left: auto;
...@@ -542,15 +541,19 @@ ...@@ -542,15 +541,19 @@
display: block; display: block;
} }
.user-status-emoji { .user-status {
margin-right: 0; margin-right: 0;
display: block;
vertical-align: text-top;
max-width: 240px; max-width: 240px;
font-size: 12px; font-size: $gl-font-size-small;
gl-emoji { gl-emoji {
font-size: $gl-font-size; font-size: $gl-font-size-small;
}
.user-status-emoji {
gl-emoji {
font-size: $gl-font-size;
}
} }
} }
} }
......
...@@ -194,6 +194,7 @@ $well-light-text-color: #5b6169; ...@@ -194,6 +194,7 @@ $well-light-text-color: #5b6169;
* Text * Text
*/ */
$gl-font-size: 14px; $gl-font-size: 14px;
$gl-font-size-small: 12px;
$gl-font-weight-normal: 400; $gl-font-weight-normal: 400;
$gl-font-weight-bold: 600; $gl-font-weight-bold: 600;
$gl-text-color: #2e2e2e; $gl-text-color: #2e2e2e;
......
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
= current_user.name = current_user.name
= current_user.to_reference = current_user.to_reference
- if current_user.status - if current_user.status
.user-status-emoji.str-truncated.has-tooltip{ title: current_user.status.message_html, data: { html: 'true', placement: 'bottom' } } .user-status.d-flex.align-items-center.prepend-top-2.has-tooltip{ title: current_user.status.message_html, data: { html: 'true', placement: 'bottom' } }
= emoji_icon current_user.status.emoji %span.user-status-emoji.d-flex.align-items-center
= current_user.status.message_html.html_safe = emoji_icon current_user.status.emoji
%span.user-status-message.str-truncated
= current_user.status.message_html.html_safe
%li.divider %li.divider
- if can?(current_user, :update_user_status, current_user) - if can?(current_user, :update_user_status, current_user)
%li %li
......
---
title: Fix size of emojis of user status in user menu
merge_request: 22194
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment