Merge branch 'develop' of github.com:Ranks/emojify.js into develop

Conflicts: dist/css/data-uri/emojify.css dist/css/data-uri/emojify.min.css dist/css/sprites/emojify-emoticons.css dist/css/sprites/emojify-emoticons.min.css dist/css/sprites/emojify.css dist/css/sprites/emojify.min.css dist/images/sprites/emojify.png dist/images/sprites/emojify@2x.png
Ranks · 7f14622b5d4a8271556561ccc2351a43e695c002 · mshenfield committed Jun 25, 2015 · Jun 25, 2015 · 7f14622
2 parents 3a13ca3 + 1529a12
commit 7f14622b5d4a8271556561ccc2351a43e695c002
@@ -1,6 +1,16 @@
-*
-!dist
-!dist/*
-!README.md
+.bowerrc
+.editorconfig
+.gitattributes
+.gitignore
+.htaccess
+.jshintrc
+.travis.yml
+appveyor.yml
+index.html
+
+
+build/
+src/
+tests/
 !LICENSE.md
 !LICENSE-IMAGES.md
@@ -1,7 +1,7 @@
 {
   "name": "emojify.js",
   "main": "dist/js/emojify.js",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "homepage": "https://github.com/hassankhan/emojify.js",
   "authors": [
     "Hassan Khan (hassankhan)"
@@ -1,5 +1,5 @@
     .emoji {
-        background-image: url('../../images/sprites/emojify-emoticons.png');
+        background-image: url('../../images/emojify-emoticons.png');
         display: inline-block;
     }
 
@@ -117,4 +117,3 @@
         width: 32px;
         height: 32px;
     }
-
@@ -1 +1 @@
-.emoji{background-image:url(../../images/sprites/emojify-emoticons.png);display:inline-block}@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){.emoji{background-image:url(../../images/sprites/emojify-emoticons@2x.png);background-size:180px 144px}}.emoji-broken_heart{background-position:-38px -2px;width:32px;height:32px}.emoji-confounded{background-position:-110px -2px;width:32px;height:32px}.emoji-flushed{background-position:-2px -38px;width:32px;height:32px}.emoji-frowning{background-position:-38px -38px;width:32px;height:32px}.emoji-grinning{background-position:-74px -2px;width:32px;height:32px}.emoji-heart{background-position:-74px -38px;width:32px;height:32px}.emoji-kissing_heart{background-position:-2px -74px;width:32px;height:32px}.emoji-mask{background-position:-38px -74px;width:32px;height:32px}.emoji-pensive{background-position:-74px -74px;width:32px;height:32px}.emoji-rage{background-position:-2px -2px;width:32px;height:32px}.emoji-relaxed{background-position:-110px -38px;width:32px;height:32px}.emoji-scream{background-position:-110px -74px;width:32px;height:32px}.emoji-smile{background-position:-2px -110px;width:32px;height:32px}.emoji-smirk{background-position:-38px -110px;width:32px;height:32px}.emoji-sob{background-position:-74px -110px;width:32px;height:32px}.emoji-stuck_out_tongue_closed_eyes{background-position:-110px -110px;width:32px;height:32px}.emoji-stuck_out_tongue_winking_eye{background-position:-146px -2px;width:32px;height:32px}.emoji-wink{background-position:-146px -38px;width:32px;height:32px}
+.emoji{background-image:url(../../images/sprites/emojify-emoticons.png);display:inline-block}@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){.emoji{background-image:url(../../images/sprites/emojify-emoticons@2x.png);background-size:180px 144px}}.emoji-broken_heart{background-position:-38px -2px;width:32px;height:32px}.emoji-confounded{background-position:-110px -2px;width:32px;height:32px}.emoji-flushed{background-position:-2px -38px;width:32px;height:32px}.emoji-frowning{background-position:-38px -38px;width:32px;height:32px}.emoji-grinning{background-position:-74px -2px;width:32px;height:32px}.emoji-heart{background-position:-74px -38px;width:32px;height:32px}.emoji-kissing_heart{background-position:-2px -74px;width:32px;height:32px}.emoji-mask{background-position:-38px -74px;width:32px;height:32px}.emoji-pensive{background-position:-74px -74px;width:32px;height:32px}.emoji-rage{background-position:-2px -2px;width:32px;height:32px}.emoji-relaxed{background-position:-110px -38px;width:32px;height:32px}.emoji-scream{background-position:-110px -74px;width:32px;height:32px}.emoji-smile{background-position:-2px -110px;width:32px;height:32px}.emoji-smirk{background-position:-38px -110px;width:32px;height:32px}.emoji-sob{background-position:-74px -110px;width:32px;height:32px}.emoji-stuck_out_tongue_closed_eyes{background-position:-110px -110px;width:32px;height:32px}.emoji-stuck_out_tongue_winking_eye{background-position:-146px -2px;width:32px;height:32px}.emoji-wink{background-position:-146px -38px;width:32px;height:32px}
@@ -26,7 +26,7 @@ gulp.task('default', ['compile']);
 
 gulp.task('compile', ['script', 'images-and-styles']);
 
-gulp.task('release', ['bump', 'compile']);
+gulp.task('release', ['update', 'compile', 'bump']);
 
 gulp.task('script', function(){
     var pkg = require('./package.json');
@@ -1,6 +1,6 @@
 {
   "name": "emojify.js",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "A Javascript module to convert emoji keywords to images.",
   "main": "dist/js/emojify.js",
   "scripts": {