Fix merge conflicts

1 files changed, 57 insertions, 60 deletions

diff --git a/src/sass/lib/mixins.scss b/src/sass/lib/mixins.scss
index 5a1ca753..cbb8cc78 100644
--- a/src/sass/lib/mixins.scss
+++ b/src/sass/lib/mixins.scss
@@ -4,93 +4,90 @@
 
 // Nicer focus styles
 // ---------------------------------------
-@mixin plyr-tab-focus($color: $plyr-tab-focus-default-color) {
-    box-shadow: 0 0 0 5px rgba($color, 0.5);
-    outline: 0;
+@mixin plyr-tab-focus($color: $plyr-tab-focus-color) {
+  outline-color: $color;
+  outline-offset: 2px;
+  outline-style: dotted;
+  outline-width: 3px;
 }
 
 // Font smoothing
 // ---------------------------------------
 @mixin plyr-font-smoothing($mode: true) {
-    @if $mode {
-        -moz-osx-font-smoothing: grayscale;
-        -webkit-font-smoothing: antialiased;
-    } @else {
-        -moz-osx-font-smoothing: auto;
-        -webkit-font-smoothing: subpixel-antialiased;
-    }
+  @if $mode {
+    -moz-osx-font-smoothing: grayscale;
+    -webkit-font-smoothing: antialiased;
+  }
 }
 
 // <input type="range"> styling
 // ---------------------------------------
 @mixin plyr-range-track() {
-    background: transparent;
-    border: 0;
-    border-radius: ($plyr-range-track-height / 2);
-    height: $plyr-range-track-height;
-    transition: box-shadow 0.3s ease;
-    user-select: none;
+  background: transparent;
+  border: 0;
+  border-radius: calc(#{$plyr-range-track-height} / 2);
+  height: $plyr-range-track-height;
+  transition: box-shadow 0.3s ease;
+  user-select: none;
 }
 
 @mixin plyr-range-thumb() {
-    background: $plyr-range-thumb-bg;
-    border: 0;
-    border-radius: 100%;
-    box-shadow: $plyr-range-thumb-shadow;
-    height: $plyr-range-thumb-height;
-    position: relative;
-    transition: all 0.2s ease;
-    width: $plyr-range-thumb-height;
+  background: $plyr-range-thumb-background;
+  border: 0;
+  border-radius: 100%;
+  box-shadow: $plyr-range-thumb-shadow;
+  height: $plyr-range-thumb-height;
+  position: relative;
+  transition: all 0.2s ease;
+  width: $plyr-range-thumb-height;
 }
 
-@mixin plyr-range-thumb-active($color: rgba($plyr-range-thumb-bg, 0.5)) {
-    box-shadow: $plyr-range-thumb-shadow, 0 0 0 $plyr-range-thumb-active-shadow-width $color;
+@mixin plyr-range-thumb-active($color) {
+  box-shadow: $plyr-range-thumb-shadow, 0 0 0 $plyr-range-thumb-active-shadow-width $color;
 }
 
 // Fullscreen styles
 // ---------------------------------------
 @mixin plyr-fullscreen-active() {
-    background: #000;
-    border-radius: 0 !important;
-    height: 100%;
-    margin: 0;
-    width: 100%;
+  background: #000;
+  border-radius: 0 !important;
+  height: 100%;
+  margin: 0;
+  width: 100%;
 
-    video {
-        height: 100%;
-    }
+  video {
+    height: 100%;
+  }
 
-    .plyr__video-wrapper {
-        height: 100%;
-        position: static;
-    }
+  .plyr__video-wrapper {
+    height: 100%;
+    position: static;
+  }
 
-    // Vimeo requires some different styling
-    &.plyr--vimeo .plyr__video-wrapper {
-        height: 0;
-        position: relative;
-        top: 50%;
-        transform: translateY(-50%);
-    }
+  // Vimeo requires some different styling
+  &.plyr--vimeo .plyr__video-wrapper {
+    height: 0;
+    position: relative;
+  }
 
-    // Display correct icon
-    .plyr__control .icon--exit-fullscreen {
-        display: block;
+  // Display correct icon
+  .plyr__control .icon--exit-fullscreen {
+    display: block;
 
-        + svg {
-            display: none;
-        }
+    + svg {
+      display: none;
     }
+  }
 
-    // Hide cursor in fullscreen when controls hidden
-    &.plyr--hide-controls {
-        cursor: none;
-    }
+  // Hide cursor in fullscreen when controls hidden
+  &.plyr--hide-controls {
+    cursor: none;
+  }
 
-    // Large captions in full screen on larger screens
-    @media (min-width: $plyr-bp-lg) {
-        .plyr__captions {
-            font-size: $plyr-font-size-captions-large;
-        }
+  // Large captions in full screen on larger screens
+  @media (min-width: $plyr-bp-lg) {
+    .plyr__captions {
+      font-size: $plyr-font-size-captions-large;
     }
+  }
 }