resolves MR discussions:

- adds MR# to changelog
- adds pixel variables for margin
- changes line-height for user-status-emoji

3 files changed, 5 insertions, 5 deletions

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index cc10d305b40..0a73f0877ff 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -703,11 +703,11 @@
   text-overflow: ellipsis;
 
   .user-status-emoji {
-    margin: 0 8px 0 4px;
+    margin: 0 $gl-padding-8 0 $gl-padding-4;
 
     gl-emoji {
       font-size: 1em;
-      line-height: 1;
+      line-height: 16px;
     }
   }
 }
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 1fd725ee589..dd332845ea5 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -196,11 +196,11 @@
   }
 
   .user-status-emoji {
-    margin-right: 4px;
+    margin-right: $gl-padding-4;
 
     gl-emoji {
       font-size: 1em;
-      line-height: 1;
+      line-height: 16px;
     }
   }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 9a9977d43ac..3d28adcb156 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -427,7 +427,7 @@ ul.notes {
 
     gl-emoji {
       font-size: 1em;
-      line-height: 1;
+      line-height: 16px;
     }
   }
 }