Skip to content

1.1.0 #146

Merged
merged 10 commits into from

3 participants

@adam-lynch
ranks.com member

No description provided.

mshenfield and others added some commits
@mshenfield mshenfield Fix #139. Remove old files on 'gulp update'.
Added a single line to the gulp.js file.  The directory './src/images/emoji'
is deleted when `gulp update` is called, and then populated from the master
branch of emoji-cheat-sheet.com as usual.

I ran `gulp clean`, `gulp update`, and `gulp compile`, removing 4 defunct
emoji images and a css file inside the 'src/images/emoji' folder. This also
removed these items from the 'dist/images/basic' folder, and caused each
of the sprit '.png' and '.css' files to be augmented, since 4 fewer images
were included.

I had some issues with file permissions running these commands.  The were
saved to disk with permissions `rw-r--r--` (644). I had to manually change them
back to their original permissions of `rwxrwxr-x` (755).  Some files were
also 644 by default, including `dist/css/basic/emojify[.min].css` and
`dist/js/emojify[.min].js`.

I did not include the `dist/css/data-uri/` folder, though the '.css' files
were also changed by removing sprites. For some reason, the `background`
attribute was replaced by `background-image`. I'll commit
them next, and can push them up as needed.
42b7888
@mshenfield mshenfield Changed 'background' to 'background-image' in 'dist/css/data-uri/*'
Running the automated build using `gulp clean`, `gulp update`, and `gulp compile`
uses attribute 'background-image' instead of 'background' in all '.css' files. Have
css-sprite v0.9.9 installed.
0df633f
@hassankhan hassankhan Merge branch 'release/1.0.5' into develop 1529a12
@mshenfield mshenfield Updated permissions from 644 to 775
For some reason regenerating the images placed them on my machine
with restricted access. This commit stops these files from preventing
things like `ls` `git pull` and other common commands.
3a13ca3
@mshenfield mshenfield 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
7f14622
@hassankhan hassankhan Merge pull request #140 from mshenfield/develop
Fix #139. Remove old files on 'gulp update'.
bfb052b
@adam-lynch adam-lynch Interprets :o and :O 89967d1
@adam-lynch adam-lynch Merge pull request #142 from adam-lynch/open_mouth_short
Interprets :o and :O
7c83896
@adam-lynch adam-lynch Small fix for :o and :OI adb546c
@adam-lynch adam-lynch 1.1.0
87dc269
@adam-lynch adam-lynch merged commit 230b992 into master

0 of 2 checks passed

Details continuous-integration/travis-ci/pr The Travis CI build is in progress
Details continuous-integration/travis-ci/push The Travis CI build is in progress
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.