Merge branch 'italicized_emoji' into 'master'

Emoji was rendered as italic Closes #31676 See merge request !13974

Merge branch 'italicized_emoji' into 'master'
b59bc23c · Annabel Dunstone Gray · 668e1f4c · cab899cf · b59bc23c · b59bc23c
Commit b59bc23c authored Sep 11, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

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

italicized_emoji.yml changelogs/unreleased/italicized_emoji.yml +5 -0

No files found.
--- a/app/assets/stylesheets/framework/emojis.scss
+++ b/app/assets/stylesheets/framework/emojis.scss
 gl-emoji {
+  font-style: normal;
  display: inline-flex;
  vertical-align: middle;
  font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";

--- a/changelogs/unreleased/italicized_emoji.yml
+++ b/changelogs/unreleased/italicized_emoji.yml
+---
+title: Update native unicode emojis to always render as normal text (previously could render italicized)
+merge_request:
+author: Branka Martinovic
+type: fixed