Merge branch 'master' into 'f0ckdev'

Master



See merge request !6
This commit is contained in:
Flummi 2016-10-20 22:20:34 +00:00
commit 2bda72f792

View File

@ -9,15 +9,15 @@
<body>
<div class="return"><a href="/" title="return to main">f0ck.me</a></div>
<div class="controls">{% if next != null %}<a id="next" href="/{{ next }}"><<-</a> | {% endif %} <a id="random" href="/random" title="Random">random</a> {% if prev != null %} | <a id="prev" href="/{{ prev }}">->></a>{% endif %}</div><br />
{% if thumb != null %}
<div class="thumbnail">
<img src="{{ thumb }}" />
</div>
{% endif %}
<div class="medium">
<div class="medium">
{% if item == "video" %}
<video id="player" src="{{ dest }}" style="max-width: 1280px; height: 50%;" preload="auto" autoplay controls loop></video>
{% elseif item == "audio" %}
{% if thumb != null %}
<div class="thumbnail">
<img src="{{ thumb }}" />
</div>
{% endif %}
<audio controls loop src="{{ dest }}" type="audio/mp3" autoplay></audio>
{% elseif item == "image" %}
<a href="{{ dest }}" target="_blank"><img src="{{ dest }}" style="max-width: 1024px" /></a>
@ -62,7 +62,7 @@
});
}
var video = document.getElementById('player');
video.volume = 0.3;
video.volume = 0.5;
</script>
</body>
<! Fuck git… seriously-->