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

Commit 230b992

Browse files
adam-lynchadam-lynch
committed
Merge pull request #146 from Ranks/develop
1.1.0
2 parents fe0dd41 + 87dc269 commit 230b992

File tree

1,790 files changed

+886
-917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,790 files changed

+886
-917
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.5",
4+
"version": "1.1.0",
55
"homepage": "https://github.com/hassankhan/emojify.js",
66
"authors": [
77
"Hassan Khan (hassankhan)"

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

100755100644
File mode changed.

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

100755100644
File mode changed.

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

100755100644
Lines changed: 0 additions & 16 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

100755100644
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.emoji {
2-
background-image: url('../../images/emojify-emoticons.png');
2+
background-image: url('../../images/sprites/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/emojify-emoticons@2x.png');
8+
background-image: url('../../images/sprites/emojify-emoticons@2x.png');
99
background-size: 180px 144px;
1010
}
1111
}

‎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)