Skip to content

Commit

Permalink
5.5.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
caseyahenson committed May 6, 2020
1 parent 411d8dc commit d2bfda5
Show file tree
Hide file tree
Showing 8 changed files with 909 additions and 914 deletions.
4 changes: 2 additions & 2 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
We've teamed up with [JSDelivr](https://www.npmjs.com/settings/joypixels/packages) to provide a simple way to install these emoji on any javascript-enabled website. Add the following script and stylesheet links to the head of your webpage:

```
<script src="https://cdn.jsdelivr.net/npm/[email protected].0/lib/js/joypixels.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].0/extras/css/joypixels.min.css"/>
<script src="https://cdn.jsdelivr.net/npm/[email protected].1/lib/js/joypixels.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].1/extras/css/joypixels.min.css"/>
```

Quick installs can also be done using NPM and Bower (for the Javascript toolkit) or Composer (for the PHP toolkit). **If you wish to serve image assets locally you'll need to install [emoji-assets](https://www.github.com/joypixels/emoji-assets) and include the pngs and/or sprites into your project.** Many of our [demos](https://demos.joypixels.com/latest/) use assets locally simply by pointing the `imagePathPNG` variable to your local asset location.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emoji-toolkit",
"version": "5.5.0",
"version": "5.5.1",
"main": [
"extras/css/joypixels.css",
"lib/js/joypixels.js"
Expand Down
2 changes: 1 addition & 1 deletion emoji.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion emoji_strategy.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/js/joypixels.min.js

Large diffs are not rendered by default.

1,804 changes: 899 additions & 905 deletions lib/php/src/Ruleset.php

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package.describe({
name: 'joypixels:emoji-toolkit',
summary: 'Meteor Package of the https://www.joypixels.com/ set.',
version: '5.5.0',
version: '5.5.1',
git: 'https://github.com/joypixels/emoji-toolkit.git'
});

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emoji-toolkit",
"version": "5.5.0",
"version": "5.5.1",
"description": "JoyPixels is a complete set of emoji designed for the web. The emoji-toolkit includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to JoyPixels emoji images. PNG formats provided for the emoji images.",
"author": "JoyPixels <[email protected]> (https://www.joypixels.com)",
"main": "lib/js/joypixels.js",
Expand Down Expand Up @@ -36,7 +36,8 @@
"grunt-contrib-sass": "^0.9.2",
"grunt-contrib-uglify": "^0.8.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-jsonlint": "^1.0.4"
"grunt-jsonlint": "^1.0.4",
"grunt-sass": "^3.1.0"
},
"scripts": {
"test": "grunt travis"
Expand Down

0 comments on commit d2bfda5

Please sign in to comment.