Merge branch 'develop' into a11y-improvements

# Conflicts:
#	src/js/controls.js
This commit is contained in:
Sam Potts
2018-08-01 00:46:26 +10:00
4 changed files with 19 additions and 21 deletions

View File

@ -17,7 +17,6 @@
padding: $plyr-control-spacing;
position: absolute;
text-align: center;
transform: translateY(-($plyr-control-spacing * 4));
transition: transform 0.4s ease-in-out;
width: 100%;
@ -53,6 +52,8 @@
display: block;
}
.plyr--hide-controls .plyr__captions {
transform: translateY(-($plyr-control-spacing * 1.5));
// If the lower controls are shown and not empty
.plyr:not(.plyr--hide-controls) .plyr__controls:not(:empty) ~ .plyr__captions {
transform: translateY(-($plyr-control-spacing * 4));
}

View File

@ -32,12 +32,9 @@
margin-left: ($plyr-control-spacing / 2);
}
// Hide empty controls
&:empty {
display: none;
~ .plyr__captions {
transform: translateY(0);
}
}
@media (min-width: $plyr-bp-sm) {