Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
b59bc23c
Commit
b59bc23c
authored
Sep 11, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'italicized_emoji' into 'master'
Emoji was rendered as italic Closes #31676 See merge request !13974
parents
668e1f4c
cab899cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
app/assets/stylesheets/framework/emojis.scss
app/assets/stylesheets/framework/emojis.scss
+1
-0
changelogs/unreleased/italicized_emoji.yml
changelogs/unreleased/italicized_emoji.yml
+5
-0
No files found.
app/assets/stylesheets/framework/emojis.scss
View file @
b59bc23c
gl-emoji
{
gl-emoji
{
font-style
:
normal
;
display
:
inline-flex
;
display
:
inline-flex
;
vertical-align
:
middle
;
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"
;
...
...
changelogs/unreleased/italicized_emoji.yml
0 → 100644
View file @
b59bc23c
---
title
:
Update native unicode emojis to always render as normal text (previously could render italicized)
merge_request
:
author
:
Branka Martinovic
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment