diff options
| author | Sam Potts <sam@potts.es> | 2018-08-01 00:46:26 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-08-01 00:46:26 +1000 |
| commit | 13a54b5dbec03bffb8e4114074d987edd7f0079f (patch) | |
| tree | 4425e3d4d6ebdb7a15d797f4dd9f33d8c432f805 /src/sass/components | |
| parent | 748aa5179f4244b785cc293791710e13f8a7a468 (diff) | |
| parent | fa0861ff2e9b22e361ada7b1fb9ff45c0378464e (diff) | |
| download | plyr-13a54b5dbec03bffb8e4114074d987edd7f0079f.tar.lz plyr-13a54b5dbec03bffb8e4114074d987edd7f0079f.tar.xz plyr-13a54b5dbec03bffb8e4114074d987edd7f0079f.zip | |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# src/js/controls.js
Diffstat (limited to 'src/sass/components')
| -rw-r--r-- | src/sass/components/captions.scss | 7 | ||||
| -rw-r--r-- | src/sass/components/controls.scss | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/sass/components/captions.scss b/src/sass/components/captions.scss index 8fce581a..1cfca92e 100644 --- a/src/sass/components/captions.scss +++ b/src/sass/components/captions.scss @@ -17,7 +17,6 @@ padding: $plyr-control-spacing; position: absolute; text-align: center; - transform: translateY(-($plyr-control-spacing * 4)); transition: transform 0.4s ease-in-out; width: 100%; @@ -53,6 +52,8 @@ display: block; } -.plyr--hide-controls .plyr__captions { - transform: translateY(-($plyr-control-spacing * 1.5)); +// If the lower controls are shown and not empty +.plyr:not(.plyr--hide-controls) .plyr__controls:not(:empty) ~ .plyr__captions { + transform: translateY(-($plyr-control-spacing * 4)); } + diff --git a/src/sass/components/controls.scss b/src/sass/components/controls.scss index 0991a9bf..bde8600b 100644 --- a/src/sass/components/controls.scss +++ b/src/sass/components/controls.scss @@ -32,12 +32,9 @@ margin-left: ($plyr-control-spacing / 2); } + // Hide empty controls &:empty { display: none; - - ~ .plyr__captions { - transform: translateY(0); - } } @media (min-width: $plyr-bp-sm) { |