Merge pull request #146 from Ranks/develop

1.1.0
joypixels · Jul 9, 2015 · 230b992 · 230b992
2 parents fe0dd41 + 87dc269
commit 230b992
Show file tree

Hide file tree

Showing 1,790 changed files with 886 additions and 917 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "emojify.js",
   "main": "dist/js/emojify.js",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "homepage": "https://github.com/hassankhan/emojify.js",
   "authors": [
     "Hassan Khan (hassankhan)"

diff --git a/dist/css/data-uri/emojify-emoticons.css b/dist/css/data-uri/emojify-emoticons.css
diff --git a/dist/css/data-uri/emojify-emoticons.min.css b/dist/css/data-uri/emojify-emoticons.min.css
diff --git a/dist/css/data-uri/emojify.css b/dist/css/data-uri/emojify.css
diff --git a/dist/css/data-uri/emojify.min.css b/dist/css/data-uri/emojify.min.css
diff --git a/dist/css/sprites/emojify-emoticons.css b/dist/css/sprites/emojify-emoticons.css
@@ -1,11 +1,11 @@
     .emoji {
-        background-image: url('../../images/emojify-emoticons.png');
+        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/[email protected]');
+            background-image: url('../../images/sprites/[email protected]');
             background-size: 180px 144px;
         }
     }

diff --git a/dist/css/sprites/emojify-emoticons.min.css b/dist/css/sprites/emojify-emoticons.min.css