Merge branch 'fixes' into develop

Georg Fischer 2013-11-02 13:03:04 +01:00
commit 79d6c9fc8d
2 changed files with 14 additions and 4 deletions

@ -42,10 +42,10 @@
<a id="png-button" download="glitched-image.png" target="_blank" class="download-link">download bitmap file<span> (.png)</span></a> <a id="png-button" download="glitched-image.png" target="_blank" class="download-link">download bitmap file<span> (.png)</span></a>
<div id="imgur-url-container"> <div id="imgur-url-container">
<input id="imgur-url-input" type="text" readonly="readonly" /> <input id="imgur-url-input" type="text" readonly="readonly" />
<a href id="imgur-url-link" class="button" href="http://imgur.com" target="_blank">open</a> <a href id="imgur-url-link" class="button social-link" href="http://imgur.com" target="_blank">open</a>
<a href id="twitter-link" class="button" href="http://twitter.com" target="_blank" title="post your image on twitter">twitter</a> <a href id="twitter-link" class="button social-link" href="http://twitter.com" target="_blank" title="post your image on twitter">twitter</a>
<a href id="facebook-link" class="button" href="http://facebook.com" target="_blank" title="post your image on facebook">facebook</a> <a href id="facebook-link" class="button social-link" href="http://facebook.com" target="_blank" title="post your image on facebook">facebook</a>
<a href id="reddit-link" class="button" href="http://reddit.com" target="_blank" title="post your image on reddit">reddit</a> <a href id="reddit-link" class="button social-link" href="http://reddit.com" target="_blank" title="post your image on reddit">reddit</a>
<span id="imgur-url-error">sorry, something went wrong. maybe try again?</span> <span id="imgur-url-error">sorry, something went wrong. maybe try again?</span>
</div> </div>
</div> </div>

@ -234,6 +234,16 @@ a:hover
display: inline-block; display: inline-block;
} }
.social-link
{
display: none;
}
.upload-successful .social-link
{
display: inline-block;
}
.missing-feature .missing-feature
{ {