summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgfyoung <gfyoung17+gitlab@gmail.com>2018-08-16 20:29:14 +0000
committerAnnabel Gray <annabel.m.gray@gmail.com>2018-08-16 20:29:14 +0000
commiteff99e3f0dfc615e35615225661adea74360c4fc (patch)
treeff994dcddf39ec2f620767abd69ad8d5615810eb
parent216e269ea09c692132eab9f57c40009d9b1615df (diff)
downloadgitlab-ce-eff99e3f0dfc615e35615225661adea74360c4fc.tar.gz
Fix 1px cutoff of emojis
-rw-r--r--app/assets/stylesheets/pages/notes.scss3
-rw-r--r--changelogs/unreleased/emoji-cutoff-1px.yml5
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 8d28daac750..2e1b2126887 100644
--- 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
diff --git a/changelogs/unreleased/emoji-cutoff-1px.yml b/changelogs/unreleased/emoji-cutoff-1px.yml
new file mode 100644
index 00000000000..815d9c177e8
--- /dev/null
+++ b/changelogs/unreleased/emoji-cutoff-1px.yml
@@ -0,0 +1,5 @@
+---
+title: Fix 1px cutoff of emojis
+merge_request: 21180
+author: gfyoung
+type: fixed