diff options
| author | Sam <me@sampotts.me> | 2016-10-23 21:16:49 +1100 |
|---|---|---|
| committer | Sam <me@sampotts.me> | 2016-10-23 21:16:49 +1100 |
| commit | 2aa9b267ab110454a1d8c2a210e89cd8a6a1f384 (patch) | |
| tree | ca9a2fb884b11f9593869d88f7cab4b12f3fe483 /src/less | |
| parent | 90338d96000dcebd89fcb7f10d09afe0522cd1c0 (diff) | |
| parent | 5cecf16d4f9edecdbf656e2618b8748ebff677d8 (diff) | |
| download | plyr-2aa9b267ab110454a1d8c2a210e89cd8a6a1f384.tar.lz plyr-2aa9b267ab110454a1d8c2a210e89cd8a6a1f384.tar.xz plyr-2aa9b267ab110454a1d8c2a210e89cd8a6a1f384.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# src/js/plyr.js
Diffstat (limited to 'src/less')
| -rw-r--r-- | src/less/plyr.less | 16 | ||||
| -rw-r--r-- | src/less/variables.less | 5 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/less/plyr.less b/src/less/plyr.less index 5ba916cd..a23924e6 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -189,9 +189,6 @@ position: relative; background: #000; border-radius: inherit; - - // Cleaner radius, also forces iframe radius - -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC); } // Container for embeds @@ -200,6 +197,9 @@ height: 0; overflow: hidden; + // Require z-index to force border-radius + z-index: 0; + iframe { position: absolute; top: 0; @@ -208,6 +208,7 @@ height: 100%; border: 0; user-select: none; + z-index: 1; } // Vimeo hack @@ -259,12 +260,15 @@ .plyr--captions-active .plyr__captions { display: block; } -.plyr--fullscreen-active .plyr__captions { - font-size: @plyr-font-size-captions-large; -} .plyr--hide-controls .plyr__captions { transform: translateY(-(@plyr-control-spacing * 1.5)); } +// Large captions in full screen on larger screens +@media (min-width: @plyr-bp-screen-lg) { + .plyr--fullscreen-active .plyr__captions { + font-size: @plyr-font-size-captions-large; + } +} // Controls // -------------------------------------------------------------- diff --git a/src/less/variables.less b/src/less/variables.less index c7eab243..0d528380 100644 --- a/src/less/variables.less +++ b/src/less/variables.less @@ -17,7 +17,7 @@ @plyr-font-size-base: 16px; // Captions -@plyr-captions-bg: fade(#343f4a, 85%); +@plyr-captions-bg: fade(#000, 85%); @plyr-captions-color: #fff; @plyr-font-size-captions-base: @plyr-font-size-base; @plyr-font-size-captions-medium: ceil(@plyr-font-size-base * 1.5); @@ -73,4 +73,5 @@ // Breakpoints @plyr-bp-screen-sm: 480px; -@plyr-bp-screen-md: 768px;
\ No newline at end of file +@plyr-bp-screen-md: 768px; +@plyr-bp-screen-lg: 1024px;
\ No newline at end of file |