Merge branch 'emoji-cutoff-1px' into 'master'

Fix 1px cutoff of emojis Closes #47913 See merge request gitlab-org/gitlab-ce!21180

Merge branch 'emoji-cutoff-1px' into 'master'
f18bb9d5 · Annabel Gray · 216e269e · eff99e3f · f18bb9d5 · f18bb9d5
Commit f18bb9d5 authored 6 years ago by Annabel Gray
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -141,9 +141,6 @@ ul.notes {
    }
  
    .note-body {
-      overflow-x: auto;
-      overflow-y: hidden;
-
      .note-text {
        @include md-typography;
        // Reset ul style types since we're nested inside a ul already

--- a/changelogs/unreleased/emoji-cutoff-1px.yml
+++ b/changelogs/unreleased/emoji-cutoff-1px.yml
+---
+title: Fix 1px cutoff of emojis
+merge_request: 21180
+author: gfyoung
+type: fixed