keeps margin for user status emojis consistent

- adds extra margin to the user-status-emoji
- removes whitespaces from the issable_meta helper

5 files changed, 33 insertions, 2 deletions

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index d16a63d009a..cc10d305b40 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -701,6 +701,15 @@
   align-self: center;
   overflow: hidden;
   text-overflow: ellipsis;
+
+  .user-status-emoji {
+    margin: 0 8px 0 4px;
+
+    gl-emoji {
+      font-size: 1em;
+      line-height: 1;
+    }
+  }
 }
 
 .js-issuable-selector-wrap {
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 5fdb2b4a90a..1fd725ee589 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -195,6 +195,15 @@
     word-break: break-all;
   }
 
+  .user-status-emoji {
+    margin-right: 4px;
+
+    gl-emoji {
+      font-size: 1em;
+      line-height: 1;
+    }
+  }
+
   .member-group-link {
     display: inline-block;
   }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 2e1b2126887..9a9977d43ac 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -421,6 +421,15 @@ ul.notes {
   &.discussion {
     padding-bottom: 0;
   }
+
+  .user-status-emoji {
+    margin-right: 4px;
+
+    gl-emoji {
+      font-size: 1em;
+      line-height: 1;
+    }
+  }
 }
 
 .system-note .note-header-info {
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index c84ed8091c3..79449a30305 100644
--- a/app/helpers/issuables_helper.rb
+++ b/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")
diff --git a/changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml b/changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml
new file mode 100644
index 00000000000..699613d40ce
--- /dev/null
+++ b/changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml
@@ -0,0 +1,5 @@
+---
+title: Make margin of user status emoji consistent
+merge_request:
+author:
+type: other