Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Popov <alex.wayfer@gmail.com>2018-05-18 15:20:23 +0300
committerAlexander Popov <alex.wayfer@gmail.com>2018-08-13 21:11:40 +0300
commitf73a21e35710eef24b47307631f1996b35fdf9d3 (patch)
treec1ab5bc12ffc84b5bca9db8991d593316732eb11 /app/assets/stylesheets/framework/emojis.scss
parent891cb10fc9ca4ee915eecdefb2c903705fefaa64 (diff)
Add Noto Color Emoji font support
This is a font from [Google](https://www.google.com/get/noto/). Arch Linux [has a recommendation of it](https://wiki.archlinux.org/index.php/fonts#Emoji_and_symbols). Add info about this into `docs/user/markdown.md#emoji`
Diffstat (limited to 'app/assets/stylesheets/framework/emojis.scss')
-rw-r--r--app/assets/stylesheets/framework/emojis.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss
index 3cde0490371..a8ec1e1145a 100644
--- a/app/assets/stylesheets/framework/emojis.scss
+++ b/app/assets/stylesheets/framework/emojis.scss
@@ -2,7 +2,7 @@ gl-emoji {
font-style: normal;
display: inline-flex;
vertical-align: middle;
- font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 1.5em;
line-height: 0.9;
}