Merge branch '49644-make-margin-of-user-status-emoji-consistent' into 'master'

Resolve "Make margin of user status emoji consistent"

Closes #49644

See merge request gitlab-org/gitlab-ce!21268

app/assets/stylesheets/framework/emojis.scss

@@ -6,3 +6,13 @@ gl-emoji {
   font-size: 1.4em;
   line-height: 1em;
 }
+
+.user-status-emoji {
+  margin-right: $gl-padding-4;
+
+  gl-emoji {
+    font-size: 1em;
+    line-height: 16px;
+    vertical-align: baseline;
+  }
+}

app/assets/stylesheets/pages/issuable.scss

@@ -701,6 +701,10 @@
   align-self: center;
   overflow: hidden;
   text-overflow: ellipsis;
+
+  .user-status-emoji {
+    margin: 0 $gl-padding-8 0 $gl-padding-4;
+  }
 }
 
 .js-issuable-selector-wrap {

app/helpers/issuables_helper.rb

@@ -174,13 +174,12 @@ module IssuablesHelper
       author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-block d-sm-none")
 
       if status = user_status(issuable.author)
-        author_output << "&ensp; #{status}".html_safe
+        author_output << "#{status}".html_safe
       end
 
       author_output
     end
 
-    output << "&ensp;".html_safe
     output << content_tag(:span, (issuable_first_contribution_icon if issuable.first_contribution?), class: 'has-tooltip', title: _('1st contribution!'))
 
     output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block")

changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml

+---
+title: Make margin of user status emoji consistent
+merge_request: 21268
+author:
+type: other