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

Fix Emojis cutting in the right way

Browse source 
Fix #47913 (again), revert !21180, fix regression of !8652, improve !20137
This commit is contained in:
Alexander Popov 2018-08-29 17:33:48 +03:00
parent 42523a415d
commit 399baa1969
No known key found for this signature in database
GPG key ID: 34ECE73756447714
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; 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;
} }

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

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

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