Commit 6b50be9e authored by Stan Hu's avatar Stan Hu

Merge branch 'ce-to-ee-2018-08-30' into 'master'

CE upstream - 2018-08-30 00:21 UTC

See merge request gitlab-org/gitlab-ee!7061
parents 8c88889e 1073931a
...@@ -3,6 +3,6 @@ gl-emoji { ...@@ -3,6 +3,6 @@ gl-emoji {
display: inline-flex; display: inline-flex;
vertical-align: middle; vertical-align: middle;
font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 1.5em; font-size: 1.4em;
line-height: 0.9; line-height: 1em;
} }
...@@ -141,6 +141,9 @@ ul.notes { ...@@ -141,6 +141,9 @@ ul.notes {
} }
.note-body { .note-body {
overflow-x: auto;
overflow-y: hidden;
.note-text { .note-text {
@include md-typography; @include md-typography;
// Reset ul style types since we're nested inside a ul already // Reset ul style types since we're nested inside a ul already
......
---
title: Fix Emojis cutting in the right way
merge_request:
author: Alexander Popov
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment