diff options
| author | Sam Potts <me@sampotts.me> | 2017-03-25 11:24:38 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-03-25 11:24:38 +1100 |
| commit | b083bf4297396712e3b3a7270a3658c9fd7aff7a (patch) | |
| tree | 72f856d6b431a26e24b3ddfbb34808944f18220d /src | |
| parent | ebc7ed538a292211cf45cc6b638e9527170d0f06 (diff) | |
| parent | 4957e4d80c833bbfa915c0c20d3d79245221b6f6 (diff) | |
| download | plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.tar.lz plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.tar.xz plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# src/js/plyr.js
# src/less/plyr.less
# src/scss/plyr.scss
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/plyr.js | 2 | ||||
| -rw-r--r-- | src/less/plyr.less | 10 | ||||
| -rw-r--r-- | src/scss/plyr.scss | 9 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index 2c85af51..d797f66d 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -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) { diff --git a/src/less/plyr.less b/src/less/plyr.less index 16bfbf14..f4a0a754 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -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; diff --git a/src/scss/plyr.scss b/src/scss/plyr.scss index 08f41920..e75a2eda 100644 --- a/src/scss/plyr.scss +++ b/src/scss/plyr.scss @@ -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; |