summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-03-16 19:57:43 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-03-16 22:46:31 -0500
commit790d9d401bca8883dd204b2d2f46c6383e462a95 (patch)
treeae59a377a508b9a8cefa247ebd948de3483c85c4
parent4bf4612cfbe73845391375bf721592426d7b4181 (diff)
downloadgitlab-ce-29557-fix-unicode-1-1.tar.gz
Fix Unicode 1.1 emojis29557-fix-unicode-1-1
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29557 When using the full font-stack some the Unicode 1.1 emojis are taken up by fonts closer up the stack and don't represent the emoji well. ``` font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; ``` - On Windows, "Segoe UI" -> "Arial" takes over - On mac OS, "Helvetia" -> ".SF NS Display" takes over mac OS 10.12.3 | Windows 10 --- | --- ![](http://i.imgur.com/JI99zoH.png) | ![](http://i.imgur.com/aek8G1X.png) --- When using a shorter emoji font-stack, everything seems to be covered well :tada: ``` font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; ``` - On Windows, "Segoe UI Emoji" takes over - On mac OS, "Apply Color Emoji" takes over mac OS 10.12.3 | Windows 10 --- | --- ![](http://i.imgur.com/bDwpGCw.png) | ![](http://i.imgur.com/7kUwEJQ.png)
-rw-r--r--app/assets/stylesheets/framework/emojis.scss1
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;
}