Skip to content
This repository was archived by the owner on Oct 3, 2018. It is now read-only.

Commit fe0dd41

Browse files
committed
Merge branch 'release/1.0.5'
2 parents 658e25b + c613781 commit fe0dd41

16 files changed

+1802
-1802
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "emojify.js",
33
"main": "dist/js/emojify.js",
4-
"version": "1.0.3",
4+
"version": "1.0.5",
55
"homepage": "https://github.com/hassankhan/emojify.js",
66
"authors": [
77
"Hassan Khan (hassankhan)"

dist/css/data-uri/emojify-emoticons.css

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/data-uri/emojify-emoticons.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/data-uri/emojify.css

Lines changed: 868 additions & 868 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/data-uri/emojify.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/sprites/emojify-emoticons.css

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,119 @@
11
.emoji {
2-
background-image: url('../../images/sprites/emojify-emoticons.png');
2+
background-image: url('../../images/emojify-emoticons.png');
33
display: inline-block;
44
}
55

66
@media (min--moz-device-pixel-ratio: 1.5), (-o-min-device-pixel-ratio: 3/2), (-webkit-min-device-pixel-ratio: 1.5), (min-device-pixel-ratio: 1.5), (min-resolution: 1.5dppx) {
77
.emoji {
8-
background-image: url('../../images/sprites/emojify-emoticons@2x.png');
9-
background-size: 185px 148px;
8+
background-image: url('../../images/emojify-emoticons@2x.png');
9+
background-size: 180px 144px;
1010
}
1111
}
1212

13-
.emoji-rage {
14-
background-position: -2px -2px;
13+
.emoji-broken_heart {
14+
background-position: -38px -2px;
1515
width: 32px;
1616
height: 32px;
1717
}
1818

19-
.emoji-broken_heart {
20-
background-position: -39px -2px;
19+
.emoji-confounded {
20+
background-position: -110px -2px;
2121
width: 32px;
2222
height: 32px;
2323
}
2424

2525
.emoji-flushed {
26-
background-position: -2px -39px;
26+
background-position: -2px -38px;
2727
width: 32px;
2828
height: 32px;
2929
}
3030

3131
.emoji-frowning {
32-
background-position: -39px -39px;
32+
background-position: -38px -38px;
3333
width: 32px;
3434
height: 32px;
3535
}
3636

3737
.emoji-grinning {
38-
background-position: -76px -2px;
38+
background-position: -74px -2px;
3939
width: 32px;
4040
height: 32px;
4141
}
4242

4343
.emoji-heart {
44-
background-position: -76px -39px;
44+
background-position: -74px -38px;
4545
width: 32px;
4646
height: 32px;
4747
}
4848

4949
.emoji-kissing_heart {
50-
background-position: -2px -76px;
50+
background-position: -2px -74px;
5151
width: 32px;
5252
height: 32px;
5353
}
5454

5555
.emoji-mask {
56-
background-position: -39px -76px;
56+
background-position: -38px -74px;
5757
width: 32px;
5858
height: 32px;
5959
}
6060

6161
.emoji-pensive {
62-
background-position: -76px -76px;
62+
background-position: -74px -74px;
6363
width: 32px;
6464
height: 32px;
6565
}
6666

67-
.emoji-confounded {
68-
background-position: -113px -2px;
67+
.emoji-rage {
68+
background-position: -2px -2px;
6969
width: 32px;
7070
height: 32px;
7171
}
7272

7373
.emoji-relaxed {
74-
background-position: -113px -39px;
74+
background-position: -110px -38px;
7575
width: 32px;
7676
height: 32px;
7777
}
7878

7979
.emoji-scream {
80-
background-position: -113px -76px;
80+
background-position: -110px -74px;
8181
width: 32px;
8282
height: 32px;
8383
}
8484

8585
.emoji-smile {
86-
background-position: -2px -113px;
86+
background-position: -2px -110px;
8787
width: 32px;
8888
height: 32px;
8989
}
9090

9191
.emoji-smirk {
92-
background-position: -39px -113px;
92+
background-position: -38px -110px;
9393
width: 32px;
9494
height: 32px;
9595
}
9696

9797
.emoji-sob {
98-
background-position: -76px -113px;
98+
background-position: -74px -110px;
9999
width: 32px;
100100
height: 32px;
101101
}
102102

103103
.emoji-stuck_out_tongue_closed_eyes {
104-
background-position: -113px -113px;
104+
background-position: -110px -110px;
105105
width: 32px;
106106
height: 32px;
107107
}
108108

109109
.emoji-stuck_out_tongue_winking_eye {
110-
background-position: -150px -2px;
110+
background-position: -146px -2px;
111111
width: 32px;
112112
height: 32px;
113113
}
114114

115115
.emoji-wink {
116-
background-position: -150px -39px;
116+
background-position: -146px -38px;
117117
width: 32px;
118118
height: 32px;
119119
}

dist/css/sprites/emojify-emoticons.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)