From 399baa1969ea01e3ac3c1cdc045fc1a5b86ddd75 Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Wed, 29 Aug 2018 17:33:48 +0300 Subject: Fix Emojis cutting in the right way Fix #47913 (again), revert !21180, fix regression of !8652, improve !20137 --- app/assets/stylesheets/framework/emojis.scss | 4 ++-- app/assets/stylesheets/pages/notes.scss | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'app') 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 -- cgit v1.2.3