diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-19 12:28:52 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-19 12:28:52 +0000 |
| commit | ce6a21f742051271ae5e55795fead023f1a73068 (patch) | |
| tree | 65f7a538e9820e3653e1b38b6c2cb2bc5653bb67 | |
| parent | 6b70b772ae48ec08df80096275641d05135b3df1 (diff) | |
| parent | f8c55c7d0f3ff9d926ad6a06a993a0c140fd04fb (diff) | |
| download | gitlab-ce-ce6a21f742051271ae5e55795fead023f1a73068.tar.gz | |
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
4 files changed, 20 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 2bee2961847..d1ce3a582bb 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -530,7 +530,6 @@ .header-user { &.show .dropdown-menu { - max-height: 323px; margin-top: 4px; color: $gl-text-color; left: auto; @@ -542,15 +541,19 @@ display: block; } - .user-status-emoji { + .user-status { margin-right: 0; - display: block; - vertical-align: text-top; max-width: 240px; - font-size: 12px; + font-size: $gl-font-size-small; gl-emoji { - font-size: $gl-font-size; + font-size: $gl-font-size-small; + } + + .user-status-emoji { + gl-emoji { + font-size: $gl-font-size; + } } } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 0fde6e18cc7..ad66a0365ed 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -194,6 +194,7 @@ $well-light-text-color: #5b6169; * Text */ $gl-font-size: 14px; +$gl-font-size-small: 12px; $gl-font-weight-normal: 400; $gl-font-weight-bold: 600; $gl-text-color: #2e2e2e; 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 diff --git a/changelogs/unreleased/52299-follow-up-from-resolve-add-status-message-from-within-user-menu.yml b/changelogs/unreleased/52299-follow-up-from-resolve-add-status-message-from-within-user-menu.yml new file mode 100644 index 00000000000..8ea0693037f --- /dev/null +++ b/changelogs/unreleased/52299-follow-up-from-resolve-add-status-message-from-within-user-menu.yml @@ -0,0 +1,5 @@ +--- +title: Fix size of emojis of user status in user menu +merge_request: 22194 +author: +type: fixed |