Merge branch 'changes' into develop

Georg Fischer 2013-11-30 01:09:30 +01:00
commit 0f70f6afa8
2 changed files with 2 additions and 2 deletions

@ -3,7 +3,7 @@ image glitch experiment
this is an experiment for the web browser. it corrupts jpg images so that they appear "glitched".
[![triangulation experiment screen shot](http://dl.dropboxusercontent.com/u/1098704/Screenshots/github-glitch.png)](http://snorpey.github.io/jpg-glitch/)
[![glitch experiment screen shot](http://dl.dropboxusercontent.com/u/1098704/Screenshots/github-glitch.png)](http://snorpey.github.io/jpg-glitch/)
[online demo](http://snorpey.github.io/jpg-glitch/)

@ -9,7 +9,7 @@
<div class="nav-wrapper dark-bg">
<div class="export-wrapper center">
<h1 class="headline">glitch images</h1>
<button id="import-button" class="button" title="open image from your computer">import image</button>
<button id="import-button" class="button" title="open image from your computer">open image</button>
<input type="file" id="import-input" accept="image/*" />
<button id="export-button" class="button" title="save image to your computer">download image</button>
<button id="imgur-button" class="button" title="share image via imgur.com"><span>share image</span></button>