Merge branch 'f0ckdev' into 'master'

F0ckdev

See merge request !80
This commit is contained in:
noxy 2017-02-02 14:21:09 +00:00
commit 74f6b8dcea
2 changed files with 10 additions and 4 deletions

View File

@ -23,7 +23,7 @@
<div class="wrapper"> <div class="wrapper">
<div class="medium"> <div class="medium">
{% if item == "video" %} {% if item == "video" %}
<video id="player" src="{{ dest }}" style="/*max-width: 1280px; height: 50%;*/" preload="auto" controls loop></video> <video id="player" src="{{ dest }}" preload="auto" controls loop></video>
{% elseif item == "audio" %} {% elseif item == "audio" %}
{% if thumb != null %} {% if thumb != null %}
<div> <div>
@ -56,6 +56,6 @@
<script src="./s/shit.js"></script> <script src="./s/shit.js"></script>
<script src="./s/theme.js"></script> <script src="./s/theme.js"></script>
<script src="./s/plyr.js"></script> <script src="./s/plyr.js"></script>
<script>plyr.setup( { autoplay: "true" } );</script> <script>plyr.setup( { autoplay: "false" } );</script>
</body> </body>
</html> </html>

View File

@ -160,6 +160,11 @@ img {
width: 888px; width: 888px;
} }
video#player {
max-width: 100%;
height: 50%;
}
/* Plyr */ /* Plyr */
.plyr--audio .plyr__controls { .plyr--audio .plyr__controls {
padding: 0; padding: 0;
@ -174,7 +179,7 @@ img {
.plyr audio, .plyr video { .plyr audio, .plyr video {
width: 100%; width: 100%;
height: auto; height: auto!important;
vertical-align: middle; vertical-align: middle;
border-radius: inherit; border-radius: inherit;
} }
@ -243,7 +248,8 @@ img {
} }
.plyr--fullscreen-active video { .plyr--fullscreen-active video {
height: 100%; height: 100%!important;
max-width: 100%!important;
} }
.plyr--fullscreen-active { .plyr--fullscreen-active {