Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d2dee6ea

Commit d2dee6ea authored 7 years ago by Eugen Rochko Committed by GitHub 7 years ago

Downloads
- Patches
- Plain Diff

Fix custom emoji in emoji picker, persist skin tone (#5258)

parent 967e7066

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js 31 additions, 14 deletions

...odon/features/compose/components/emoji_picker_dropdown.js
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js 9 additions, 1 deletion

...res/compose/containers/emoji_picker_dropdown_container.js
app/javascript/mastodon/reducers/settings.js 2 additions, 0 deletions

app/javascript/mastodon/reducers/settings.js
app/javascript/styles/components.scss 24 additions, 7 deletions

app/javascript/styles/components.scss

with 66 additions and 22 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment