Merge branch '29557-fix-unicode-1-1' into 'master'

Fix Unicode 1.1 emojis Closes #29557 See merge request !10031

Merge branch '29557-fix-unicode-1-1' into 'master'
Fix Unicode 1.1 emojis Closes #29557 See merge request !10031
1a4aa8d7 · Clement Ho · 7a623907 · 790d9d40 · 1a4aa8d7
Commit 1a4aa8d7 authored Mar 17, 2017 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

app/assets/stylesheets/framework/emojis.scss app/assets/stylesheets/framework/emojis.scss +1 -0

No files found.
--- 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;
 }