diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:14:54 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:14:54 +0000 |
| commit | b59bc23c90f3aca6cc8209ab9b88acca36f0f568 (patch) | |
| tree | 3914bfc65a68aa9e4e609adb147ab92b4b6929b2 | |
| parent | 668e1f4c4cf63e1fa99ebd7d756a8d95609a2c2e (diff) | |
| parent | cab899cfcd289510e71da1785d66644229178647 (diff) | |
| download | gitlab-ce-b59bc23c90f3aca6cc8209ab9b88acca36f0f568.tar.gz | |
Merge branch 'italicized_emoji' into 'master'
Emoji was rendered as italic
Closes #31676
See merge request !13974
| -rw-r--r-- | app/assets/stylesheets/framework/emojis.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/italicized_emoji.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss index 2d6bc17d4ff..527e7d57c5c 100644 --- a/app/assets/stylesheets/framework/emojis.scss +++ b/app/assets/stylesheets/framework/emojis.scss @@ -1,4 +1,5 @@ gl-emoji { + font-style: normal; display: inline-flex; vertical-align: middle; font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; diff --git a/changelogs/unreleased/italicized_emoji.yml b/changelogs/unreleased/italicized_emoji.yml new file mode 100644 index 00000000000..d3f15f94363 --- /dev/null +++ b/changelogs/unreleased/italicized_emoji.yml @@ -0,0 +1,5 @@ +--- +title: Update native unicode emojis to always render as normal text (previously could render italicized) +merge_request: +author: Branka Martinovic +type: fixed |