Merge branch 'master' into develop

5 files changed, 27 insertions, 2 deletions

diff --git a/src/sass/base.scss b/src/sass/base.scss
index bf162c8a..9bb9d98a 100644
--- a/src/sass/base.scss
+++ b/src/sass/base.scss
@@ -29,6 +29,7 @@
     button {
         font: inherit;
         line-height: inherit;
+        width: auto;
     }
 
     // Ignore focus
diff --git a/src/sass/components/embed.scss b/src/sass/components/embed.scss
index d72836de..be807739 100644
--- a/src/sass/components/embed.scss
+++ b/src/sass/components/embed.scss
@@ -32,8 +32,8 @@ $embed-padding: ((100 / 16) * 9);
         pointer-events: none;
     }
 
-    // Vimeo hack
-    > div {
+    // Only used for Vimeo
+    > .plyr__video-embed__container {
         padding-bottom: to-percentage($height);
         position: relative;
         transform: translateY(-$offset);
diff --git a/src/sass/components/poster.scss b/src/sass/components/poster.scss
new file mode 100644
index 00000000..b2518a78
--- /dev/null
+++ b/src/sass/components/poster.scss
@@ -0,0 +1,22 @@
+// --------------------------------------------------------------
+// Faux poster overlay
+// --------------------------------------------------------------
+
+.plyr__poster {
+    background-color: #000;
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    height: 100%;
+    left: 0;
+    opacity: 0;
+    position: absolute;
+    top: 0;
+    transition: opacity 0.3s ease;
+    width: 100%;
+    z-index: 1;
+}
+
+.plyr--stopped .plyr__poster {
+    opacity: 1;
+}
diff --git a/src/sass/components/tooltips.scss b/src/sass/components/tooltips.scss
index 19a9ce56..537e2444 100644
--- a/src/sass/components/tooltips.scss
+++ b/src/sass/components/tooltips.scss
@@ -19,6 +19,7 @@
     transform: translate(-50%, 10px) scale(0.8);
     transform-origin: 50% 100%;
     transition: transform 0.2s 0.1s ease, opacity 0.2s 0.1s ease;
+    white-space: nowrap;
     z-index: 2;
 
     // The background triangle
diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss
index 14856957..65134331 100644
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@@ -32,6 +32,7 @@
 @import 'components/embed';
 @import 'components/menus';
 @import 'components/progress';
+@import 'components/poster';
 @import 'components/sliders';
 @import 'components/times';
 @import 'components/tooltips';