Merge branch 'master' into 'f0ckdev'

Master



See merge request !7
This commit is contained in:
Flummi 2016-10-20 23:32:19 +00:00
commit 9ca37bec55

View File

@ -14,11 +14,11 @@
<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">
<!--<div class="audiothumbnail">-->
<img src="{{ thumb }}" />
</div>
<!--</div>-->
{% endif %}
<audio controls loop src="{{ dest }}" type="audio/mp3" autoplay></audio>
<audio id="player" controls loop src="{{ dest }}" type="audio/mp3" autoplay></audio><br />
{% elseif item == "image" %}
<a href="{{ dest }}" target="_blank"><img src="{{ dest }}" style="max-width: 1024px" /></a>
{% else %}
@ -62,7 +62,10 @@
});
}
var video = document.getElementById('player');
video.volume = 0.5;
video.volume = 0.3;
var x = document.getElementById("player");
x.volume = 0.3;
</script>
</body>
<! Fuck git… seriously-->