Skip to content

Commit

Permalink
Merge pull request #205 from Hystersis/update-emoji
Browse files Browse the repository at this point in the history
Update emoji's to emoji 14
  • Loading branch information
serebrov authored Jul 12, 2022
2 parents 12ed584 + a3468e7 commit 0ac9be8
Show file tree
Hide file tree
Showing 21 changed files with 24,954 additions and 8,124 deletions.
10 changes: 5 additions & 5 deletions css/emoji-mart.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@
/* Emoji sheet has 56 columns, see also utils/emoji-data.js, SHEET_COLUMNS variable */
/* Here we use (56+1) * 100% to avoid visible edges of nearby icons when scaling for different
* screen sizes */
background-size: 5700%;
background-size: 6100%;
}
.emoji-type-image.emoji-set-apple {
background-image: url("https://unpkg.com/emoji-datasource-apple@6.0.1/img/apple/sheets-256/64.png");
background-image: url('https://unpkg.com/emoji-datasource-apple@14.0.0/img/apple/sheets-256/64.png');
}
.emoji-type-image.emoji-set-facebook {
background-image: url("https://unpkg.com/emoji-datasource-facebook@6.0.1/img/facebook/sheets-256/64.png");
background-image: url('https://unpkg.com/emoji-datasource-facebook@14.0.0/img/facebook/sheets-256/64.png');
}
.emoji-type-image.emoji-set-google {
background-image: url("https://unpkg.com/emoji-datasource-google@6.0.1/img/google/sheets-256/64.png");
background-image: url('https://unpkg.com/emoji-datasource-google@14.0.0/img/google/sheets-256/64.png');
}
.emoji-type-image.emoji-set-twitter {
background-image: url("https://unpkg.com/emoji-datasource-twitter@6.0.1/img/twitter/sheets-256/64.png");
background-image: url('https://unpkg.com/emoji-datasource-twitter@14.0.0/img/twitter/sheets-256/64.png');
}

.emoji-mart-bar {
Expand Down
2 changes: 1 addition & 1 deletion data/all.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/twitter.json

Large diffs are not rendered by default.

4,271 changes: 4,270 additions & 1 deletion dist/emoji-mart.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion docs/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<div class="row">
<emoji
v-for="emo in selectedEmojis"
:key="emo"
:data="index"
:emoji="emo"
:set="activeSet"
Expand Down Expand Up @@ -280,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@6.0.1/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-twitter@14.0.0/img/twitter/sheets-256/64.png); width: 24px; height: 24px; display: inline-block; background-size: 5700%`
return `<div class='emoji' style="${style}"></div>`
},
santaEmojiObject() {
Expand Down
20 changes: 11 additions & 9 deletions docs/bundle.js

Large diffs are not rendered by default.

Loading

0 comments on commit 0ac9be8

Please sign in to comment.