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/scss | |
| 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/scss')
| -rw-r--r-- | src/scss/plyr.scss | 15 | ||||
| -rw-r--r-- | src/scss/variables.scss | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/scss/plyr.scss b/src/scss/plyr.scss index 47917364..70518591 100644 --- a/src/scss/plyr.scss +++ b/src/scss/plyr.scss @@ -172,9 +172,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 @@ -184,6 +181,9 @@ overflow: hidden; border-radius: inherit; + // Require z-index to force border-radius + z-index: 0; + iframe { position: absolute; top: 0; @@ -244,12 +244,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 * 2)); } +// 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/scss/variables.scss b/src/scss/variables.scss index 0bd31603..da75f11a 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -69,4 +69,5 @@ $plyr-range-selected-bg: $plyr-color-main !default; // Breakpoints $plyr-bp-screen-sm: 480px !default; -$plyr-bp-screen-md: 768px !default;
\ No newline at end of file +$plyr-bp-screen-md: 768px !default; +$plyr-bp-screen-lg: 1024px !default;
\ No newline at end of file |