diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-08-29 23:36:25 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-08-29 23:36:25 +0300 |
| commit | f981d4febbbb5103262f4daa858236d9c4ed9d67 (patch) | |
| tree | 6aeba28b27e8987bfeecf6f70fb0cf2c9da0e44b | |
| parent | 380c7169cbcc67b4046bc63b62fd1c452c76ad12 (diff) | |
| parent | 399baa1969ea01e3ac3c1cdc045fc1a5b86ddd75 (diff) | |
Merge branch 'fix_emojis_cutting_and_regressions' into 'master'
Fix Emojis cutting in the right way
Closes #47913
See merge request gitlab-org/gitlab-ce!21413
| -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 |