diff options
| author | Alexander Popov <alex.wayfer@gmail.com> | 2018-08-29 17:33:48 +0300 |
|---|---|---|
| committer | Alexander Popov <alex.wayfer@gmail.com> | 2018-08-29 17:33:48 +0300 |
| commit | 399baa1969ea01e3ac3c1cdc045fc1a5b86ddd75 (patch) | |
| tree | c414fec7957e7e95a4f13fb5e90dc1bfb0c666fd | |
| parent | 42523a415df7b58bceb5d5d515e57bda180c02d8 (diff) | |
Fix Emojis cutting in the right way
Fix #47913 (again), revert !21180, fix regression of !8652, improve !20137
| -rw-r--r-- | app/assets/stylesheets/framework/emojis.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/fix_emojis_cutting_and_regressions.yml | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss index a8ec1e1145a..6c50ea719d3 100644 --- a/app/assets/stylesheets/framework/emojis.scss +++ b/app/assets/stylesheets/framework/emojis.scss @@ -3,6 +3,6 @@ gl-emoji { display: inline-flex; vertical-align: middle; font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - font-size: 1.5em; - line-height: 0.9; + font-size: 1.4em; + line-height: 1em; } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index fce04c58c24..dbe9f0c03fb 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -141,6 +141,9 @@ 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/fix_emojis_cutting_and_regressions.yml b/changelogs/unreleased/fix_emojis_cutting_and_regressions.yml new file mode 100644 index 00000000000..a9c1b88a61c --- /dev/null +++ b/changelogs/unreleased/fix_emojis_cutting_and_regressions.yml @@ -0,0 +1,5 @@ +--- +title: Fix Emojis cutting in the right way +merge_request: +author: Alexander Popov +type: fixed |