ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
This commit is contained in:
Sam Potts
2015-06-27 16:21:38 +10:00
parent 398815857f 654e9cd623
commit 240aa7aa5f
13 changed files with 433 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/less/plyr.less
View File

@ -478,7 +478,8 @@
margin: 0 @control-spacing 0 0;
padding: 0;
cursor: pointer;
background: none;
background: transparent;
border: none;
// Webkit
&::-webkit-slider-runnable-track {
@ -578,12 +579,9 @@
top: auto;
bottom: 90px;
@media (min-width: @bp-control-split) and (max-width: (@bp-captions-large - 1)) {
@media (min-width: @bp-control-split) {
bottom: 60px;
}
@media (min-width: @bp-captions-large) {
bottom: 80px;
}
}
}
.player-controls {
@ -596,11 +594,10 @@
// Hide controls when playing in full screen
&.fullscreen-hide-controls.playing .player-controls {
transform: translateY(100%) translateY(@control-spacing / 2);
transition: transform .3s 1s ease;
transition: transform .3s .2s ease;
&.hover {
transform: translateY(0);
transition-delay: 0;
}
}
}