diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-08-13 19:22:16 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-08-13 19:22:16 +0000 |
| commit | fcee676ca1ddb95aa627c2c616a11edf4cbd6c30 (patch) | |
| tree | 2ca80d4ba3a0486ef1041607d0efdb08f356be22 /app/assets/stylesheets | |
| parent | f7f31a6f910325d4456bc3a344bf359f2d59a4ee (diff) | |
| parent | f73a21e35710eef24b47307631f1996b35fdf9d3 (diff) | |
| download | gitlab-ce-fcee676ca1ddb95aa627c2c616a11edf4cbd6c30.tar.gz | |
Merge branch 'add_google_noto_color_emoji_font' into 'master'
Add Noto Color Emoji font support
See merge request gitlab-org/gitlab-ce!19036
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/emojis.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
2 files changed, 2 insertions, 2 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; } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 136a5612ddc..d2ea314f176 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -373,7 +373,7 @@ $diff-jagged-border-gradient-color: darken($white-normal, 8%); $monospace-font: 'Menlo', 'DejaVu Sans Mono', 'Liberation Mono', 'Consolas', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace; $regular-font: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, - 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; /* * Dropdowns |