1 files changed, 48 insertions, 58 deletions

diff --git a/src/less/plyr.less b/src/less/plyr.less
index 740a7ae7..a008fd21 100644
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@@ -17,7 +17,11 @@
 // Font sizes
 @font-size-small:           14px;
 @font-size-base:            16px;
-@font-size-large:           ceil((@font-size-base * 1.5)); 
+
+// Captions
+@font-size-captions-base:   ceil(@font-size-base * 1.25);
+@font-size-captions-medium: ceil(@font-size-base * 1.5);
+@font-size-captions-large:  (@font-size-base * 2); 
 
 // Controls
 @control-spacing:           10px;
@@ -189,26 +193,31 @@
         bottom: 0;
         left: 0;
         width: 100%;
-        padding: 20px;
-        min-height: 2.5em;
+        padding: (@control-spacing * 2) (@control-spacing * 2) (@control-spacing * 3);
         color: #fff;
-        font-size: @font-size-base;
-        font-weight: 600;
-        text-shadow: 
-        -1px -1px 0 @gray, 
-        1px -1px 0 @gray, 
-        -1px 1px 0 @gray, 
-        1px 1px 0 @gray;
+        font-size: @font-size-captions-base;
         text-align: center;
         .font-smoothing();
 
+        span {
+            border-radius: 2px;
+            padding: 3px 10px;
+            background: rgba(0,0,0, .9);
+        }
+        span:empty {
+            display: none;
+        }
+
         @media (min-width: @bp-captions-large) {
-            font-size: @font-size-large;
+            font-size: @font-size-captions-medium;
         }
     }
     &.captions-active &-captions {
         display: block;
     }
+    &.fullscreen-active &-captions {
+        font-size: @font-size-captions-large;
+    }
 
     // Player controls
     &-controls {
@@ -236,17 +245,20 @@
             }
         }
         
-        input + label, 
+        // Buttons
         button {
             display: inline-block;
             vertical-align: middle;
             margin: 0 2px;
             padding: (@control-spacing / 2) @control-spacing;
-            
-            transition: background .3s ease, color .3s ease, opacity .3s ease;
+            overflow: hidden;
+            border: 0;
+            background: transparent;
             border-radius: 3px;
             cursor: pointer;
-
+            color: @control-color;
+            transition: background .3s ease, color .3s ease, opacity .3s ease;
+            
             svg {
                 width: 18px;
                 height: 18px;
@@ -254,41 +266,27 @@
                 fill: currentColor;
                 transition: fill .3s ease;
             }
-        }
-        input + label,
-        .inverted:checked + label {
-            opacity: .5;
-        }
-        button, 
-        .inverted + label,
-        input:checked + label {
-            color: @control-color;
-            opacity: 1;
-        }
-        button {
-            border: 0;
-            background: transparent;
-            overflow: hidden;
-        }
         
-        // Specificity for overriding .inverted
-        button:focus,
-        button:hover,
-        [type="checkbox"]:focus + label,
-        [type="checkbox"] + label:hover {
-            background: @control-bg-hover;
-            color: @control-color-hover;
-            opacity: 1;
-        }
-        button:focus,
-        input:focus + label {
-            outline: 0;
+            // Hover and tab focus
+            &.tab-focus,
+            &:hover {
+                background: @control-bg-hover;
+                color: @control-color-hover;
+            }
+            // Default focus
+            &:focus {
+                outline: 0;
+            }
         }
+
+        // Hide toggle icons by default
         .icon-exit-fullscreen,
         .icon-muted,
         .icon-captions-on {
             display: none;
         }
+
+        // Player time
         .player-time {
             display: inline-block;
             vertical-align: middle;
@@ -309,7 +307,7 @@
 
             // Add a slash in before
             &::before {
-                content: "\2044";
+                content: '\2044';
                 margin-right: @control-spacing;
             }
         }
@@ -338,7 +336,7 @@
       
         // Arrow
         &::after {
-            content: "";
+            content: '';
             position: absolute;
             z-index: 1;
             top: 100%;
@@ -352,14 +350,11 @@
             border-width: 0 1px 1px 0;
         }
     }
-    label:hover .player-tooltip,
-    input.tab-focus:focus + label .player-tooltip, 
     button:hover .player-tooltip,
     button.tab-focus:focus .player-tooltip {
         opacity: 1;
         transform: translate(-50%, 0) scale(1);
     }
-    label:hover .player-tooltip,
     button:hover .player-tooltip {
         z-index: 3;
     }
@@ -377,7 +372,7 @@
 
         &-buffer[value],
         &-played[value],
-        &-seek[type=range] {
+        &-seek[type='range'] {
             position: absolute;
             left: 0;
             top: 0;
@@ -417,7 +412,7 @@
         // Seek control
         // <input[type='range']> element
         // Specificity is for bootstrap compatibility
-        &-seek[type=range] {
+        &-seek[type='range'] {
             z-index: 4;
             cursor: pointer;
             outline: 0;
@@ -492,7 +487,7 @@
     // Volume control
     // <input[type='range']> element
     // Specificity is for bootstrap compatibility
-    &-volume[type="range"] {
+    &-volume[type='range'] {
         display: inline-block;
         vertical-align: middle;
         -webkit-appearance: none;
@@ -558,7 +553,6 @@
     // https://developer.apple.com/library/safari/documentation/AudioVideo/Conceptual/Using_HTML5_Audio_Video/Device-SpecificConsiderations/Device-SpecificConsiderations.html
     &.ios &-volume,
     &.ios [data-player='mute'],
-    &.ios [data-player='mute'] + label,
     &-audio.ios &-controls-right {
         display: none;
     }
@@ -645,15 +639,11 @@
 
     // Some options are hidden by default
     [data-player='captions'],
-    [data-player='captions'] + label,
-    [data-player='fullscreen'],
-    [data-player='fullscreen'] + label {
+    [data-player='fullscreen'] {
         display: none;
     }
     &.captions-enabled [data-player='captions'],
-    &.captions-enabled [data-player='captions'] + label,
-    &.fullscreen-enabled [data-player='fullscreen'],
-    &.fullscreen-enabled [data-player='fullscreen'] + label {
+    &.fullscreen-enabled [data-player='fullscreen'] {
         display: inline-block;
     }
 }
\ No newline at end of file