kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Annabel Dunstone Gray 2018-08-29 20:36:25 +00:00
parent 380c7169cb 399baa1969
commit f981d4febb
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/framework/emojis.scss
View File

@ -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;
}

3
app/assets/stylesheets/pages/notes.scss
View File

@ -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

5
changelogs/unreleased/fix_emojis_cutting_and_regressions.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix Emojis cutting in the right way
merge_request:
author: Alexander Popov
type: fixed