diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-03-17 16:33:31 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-03-17 16:33:31 +0000 |
| commit | 1a4aa8d72745a8ec6574c55a2fce000437608a0f (patch) | |
| tree | 5f5d22ad10599e9cb0e64cc968f0377533d3c8e3 | |
| parent | 7a623907528a77187e070c9721469df8bdd00ec8 (diff) | |
| parent | 790d9d401bca8883dd204b2d2f46c6383e462a95 (diff) | |
| download | gitlab-ce-1a4aa8d72745a8ec6574c55a2fce000437608a0f.tar.gz | |
Merge branch '29557-fix-unicode-1-1' into 'master'
Fix Unicode 1.1 emojis
Closes #29557
See merge request !10031
| -rw-r--r-- | app/assets/stylesheets/framework/emojis.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss index 0a8bc95590e..d86ae57cd9a 100644 --- a/app/assets/stylesheets/framework/emojis.scss +++ b/app/assets/stylesheets/framework/emojis.scss @@ -2,5 +2,6 @@ gl-emoji { display: inline-block; display: inline-flex; vertical-align: middle; + font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 1.5em; } |