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
#	src/js/plyr.js
#	src/less/plyr.less
#	src/scss/plyr.scss
This commit is contained in:
Sam Potts
2017-03-25 11:24:38 +11:00
parent ebc7ed538a 4957e4d80c
commit b083bf4297
10 changed files with 76 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/plyr.js
View File

@ -3752,7 +3752,7 @@
}
// Captions
on(plyr.buttons.captions, 'click', toggleCaptions);
proxy(plyr.buttons.captions, 'click', config.listeners.captions, toggleCaptions);
// Settings
on(plyr.buttons.settings, 'click', function(event) {

10
src/less/plyr.less
View File

@ -198,7 +198,11 @@
.plyr__video-embed {
padding-bottom: 56.25%; /* 16:9 */
height: 0;
border-radius: inherit;
// Require overflow and z-index to force border-radius
overflow: hidden;
z-index: 0;
iframe {
position: absolute;
@ -208,7 +212,6 @@
height: 100%;
border: 0;
user-select: none;
z-index: 1;
}
// Vimeo hack
@ -362,6 +365,7 @@
left: 0;
right: 0;
bottom: 0;
z-index: 2;
padding: (@plyr-control-spacing * 5) @plyr-control-spacing @plyr-control-spacing;
background: linear-gradient(fade(@plyr-video-controls-bg, 0%), fade(@plyr-video-controls-bg, 70%));
border-bottom-left-radius: inherit;
@ -921,6 +925,10 @@
height: 100%;
width: 100%;
}
.plyr__video-embed {
// Revert overflow change
overflow: visible;
}
.plyr__controls {
position: absolute;
bottom: 0;

9
src/scss/plyr.scss
View File

@ -181,9 +181,12 @@
.plyr__video-embed {
padding-bottom: 56.25%; /* 16:9 */
height: 0;
overflow: hidden;
border-radius: inherit;
// Require overflow and z-index to force border-radius
overflow: hidden;
z-index: 0;
iframe {
position: absolute;
top: 0;
@ -741,6 +744,10 @@
height: 100%;
width: 100%;
}
.plyr__video-embed {
// Revert overflow change
overflow: visible;
}
.plyr__controls {
position: absolute;
bottom: 0;