diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-03-17 16:33:31 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-17 11:18:55 -0700 |
| commit | 2505264bb965286a4fcb9319214d11ecc4d51fdf (patch) | |
| tree | af2ba38516bca04b96cda299416003b5d1f9e989 | |
| parent | c19f36c97f2a861e86c3c7f3b945bcb3b80ddb22 (diff) | |
| download | gitlab-ce-2505264bb965286a4fcb9319214d11ecc4d51fdf.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; } |