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

Author: annabel

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;
+          }
         }
       }
     }

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;

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

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