Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Update to Emoji 15 #270

Merged
merged 1 commit into from
Jun 11, 2023
Merged

feat: Update to Emoji 15 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions css/emoji-mart.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
background-size: 6100%;
}
.emoji-type-image.emoji-set-apple {
background-image: url('https://unpkg.com/emoji-datasource-apple@14.0.0/img/apple/sheets-256/64.png');
background-image: url('https://unpkg.com/emoji-datasource-apple@15.0.0/img/apple/sheets-256/64.png');
}
.emoji-type-image.emoji-set-facebook {
background-image: url('https://unpkg.com/emoji-datasource-facebook@14.0.0/img/facebook/sheets-256/64.png');
background-image: url('https://unpkg.com/emoji-datasource-facebook@15.0.0/img/facebook/sheets-256/64.png');
}
.emoji-type-image.emoji-set-google {
background-image: url('https://unpkg.com/emoji-datasource-google@14.0.0/img/google/sheets-256/64.png');
background-image: url('https://unpkg.com/emoji-datasource-google@15.0.0/img/google/sheets-256/64.png');
}
.emoji-type-image.emoji-set-twitter {
background-image: url('https://unpkg.com/emoji-datasource-twitter@14.0.0/img/twitter/sheets-256/64.png');
background-image: url('https://unpkg.com/emoji-datasource-twitter@15.0.0/img/twitter/sheets-256/64.png');
}

.emoji-mart-bar {
Expand Down
2 changes: 1 addition & 1 deletion data/all.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/apple.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/facebook.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/google.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/twitter.json
View file
Open in desktop

Large diffs are not rendered by default.

4,284 changes: 4,283 additions & 1 deletion dist/emoji-mart.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/app.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export default {
let emoji = index.findEmoji(':smile:')
// Note, that position in the emoji sheet is calculated by
// `emoji` object
let style = `background-position: ${emoji.getPosition()}; background-image: url(https://unpkg.com/emoji-datasource-twitter@14.0.0/img/twitter/sheets-256/64.png); width: 24px; height: 24px; display: inline-block; background-size: 5700%`
let style = `background-position: ${emoji.getPosition()}; background-image: url(https://unpkg.com/emoji-datasource-apple@15.0.0/img/apple/sheets-256/64.png); width: 24px; height: 24px; display: inline-block; background-size: 5700%`
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ Is the twitter -> apple change functional (something did not work) or just visual (apple looks better?)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can revert this, mostly this was from a different change (twitter emojis are discontinued and do not provide Emoji 15).

return `<div class='emoji' style="${style}"></div>`
},
santaEmojiObject() {
Expand Down
10 changes: 5 additions & 5 deletions docs/bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading