Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / sass / player / peertube-skin.scss

diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss
index df71055adcdf94727f342abe589c21895beab6fe..f801064285bede3585af21ff0b44909d02f9920b 100644 (file)
--- a/client/src/sass/player/peertube-skin.scss
+++ b/client/src/sass/player/peertube-skin.scss
@@ -2,6 +2,12 @@
 @import '_mixins';
 @import './_player-variables';
 
+body {
+  --embedForegroundColor: #{$primary-foreground-color};
+
+  --embedBigPlayBackgroundColor: #{$primary-background-color};
+}
+
 @mixin big-play-button-triangle-size($triangle-size) {
   width: $triangle-size;
   height: $triangle-size;
@@ -10,27 +16,27 @@
 }
 
 .video-js.vjs-peertube-skin {
-
   font-size: $font-size;
-  color: $primary-foreground-color;
+  color: var(--embedForegroundColor);
 
   .vjs-dock-text {
     padding-right: 10px;
+    background: linear-gradient(to bottom, rgba(0, 0, 0, .6) 0, rgba(0, 0, 0, 0.2) 70%, rgba(0, 0, 0, 0) 100%);
   }
 
+  .vjs-dock-title,
   .vjs-dock-description {
-    font-size: 11px;
+    text-shadow: 0 0 2px rgba(0, 0, 0, .5);
+  }
 
-    &::before, &::after {
-      display: inline-block;
-      content: '\1F308';
-    }
+  .vjs-dock-description {
+    font-size: 11px;
 
-    &::before {
+    .text::before {
       margin-right: 4px;
     }
 
-    &::after {
+    .text::after {
       margin-left: 4px;
       transform: scale(-1, 1);
     }
@@ -55,7 +61,7 @@
     $big-play-width: 1.2em;
     $big-play-height: 1.2em;
 
-    border: 6px solid #fff;
+    border: 2px solid #fff;
     border-radius: 100%;
 
     left: 50%;
@@ -104,6 +110,18 @@
     }
   }
 
+  // Show poster and controls when playing audio-only content
+  &.vjs-playing-audio-only-content {
+    .vjs-poster {
+      display: block;
+      visibility: visible;
+    }
+
+    .vjs-control-bar {
+      opacity: $primary-foreground-opacity-hover;
+    }
+  }
+
   // Hide the big play button on autoplay
   &.vjs-has-autoplay {
     .vjs-big-play-button {
@@ -114,7 +132,7 @@
   .vjs-control-bar,
   .vjs-big-play-button,
   .vjs-settings-dialog {
-    background-color: rgba($primary-background-color, 0.5);
+    background-color: var(--embedBigPlayBackgroundColor);
   }
 
   .vjs-poster {
@@ -139,7 +157,8 @@
     .vjs-theater-control,
     .vjs-settings
     {
-      color: $primary-foreground-color !important;
+      color: var(--embedForegroundColor) !important;
+
       opacity: $primary-foreground-opacity;
       transition: opacity .1s;
 
@@ -151,7 +170,7 @@
     .vjs-current-time,
     .vjs-duration,
     .vjs-peertube {
-      color: $primary-foreground-color;
+      color: var(--embedForegroundColor);
       opacity: $primary-foreground-opacity;
     }
 
@@ -171,7 +190,7 @@
         transition: none;
 
         .vjs-play-progress {
-          background: $primary-foreground-color;
+          background: var(--embedForegroundColor);
 
           // Not display the circle if the progress is not hovered
           &::before {
@@ -210,7 +229,8 @@
 
       cursor: pointer;
       font-size: $font-size;
-      margin-right: 5px;
+      margin-left: 1em;
+      width: 3em;
     }
 
     .vjs-time-control {
@@ -220,6 +240,7 @@
         font-size: $font-size;
         display: inline-block;
         padding: 0;
+        margin-left: .5em;
 
         .vjs-current-time-display {
           line-height: calc(#{$control-bar-height} + 1px);
@@ -249,6 +270,7 @@
       width: 100%;
       line-height: $control-bar-height;
       text-align: right;
+      margin-right: 6px;
 
       .vjs-peertube-displayed {
         display: block;
@@ -258,14 +280,41 @@
         display: none;
       }
 
-      .download-speed-number, .upload-speed-number, .peers-number {
+      .download-speed-number, .upload-speed-number, .peers-number, .http-fallback {
         font-weight: $font-semibold;
       }
 
-      .download-speed-text, .upload-speed-text, .peers-text {
+      .download-speed-text, .upload-speed-text, .peers-text, .http-fallback {
         margin-right: 15px;
       }
 
+      .icon {
+        &.icon-download {
+          background-image: url('#{$assets-path}/player/images/arrow-down.svg');
+        }
+
+        &.icon-upload {
+          background-image: url('#{$assets-path}/player/images/arrow-up.svg');
+        }
+      }
+    }
+
+    .vjs-next-video {
+      line-height: $control-bar-height;
+      text-align: right;
+
+      .icon {
+        &.icon-next {
+          mask-image: url('#{$assets-path}/player/images/next.svg');
+          background-color: white;
+          mask-size: cover;
+          transform: scale(2.2);
+        }
+      }
+    }
+
+    .vjs-peertube,
+    .vjs-next-video {
       .icon {
         display: inline-block;
         width: 15px;
@@ -273,17 +322,8 @@
         background-size: contain;
         vertical-align: middle;
         background-repeat: no-repeat;
-        margin-right: 6px;
         position: relative;
         top: -1px;
-
-        &.icon-download {
-          background-image: url('#{$assets-path}/player/images/arrow-down.svg');
-        }
-
-        &.icon-upload {
-          background-image: url('#{$assets-path}/player/images/arrow-up.svg');
-        }
       }
     }
 
@@ -406,6 +446,7 @@
 
       width: 37px;
       margin-right: 1px;
+      cursor: pointer;
 
       .vjs-icon-placeholder {
         transition: transform 0.2s ease;
@@ -482,7 +523,7 @@
 
     .vjs-big-play-button {
       font-size: 5em;
-      border-width: 5px;
+      border-width: 3px;
 
       .vjs-icon-placeholder::before {
         @include big-play-button-triangle-size(32px);
@@ -497,17 +538,13 @@
 
     .vjs-big-play-button {
       font-size: 4.5em;
-      border-width: 4.5px;
+      border-width: 2.5px;
 
       .vjs-icon-placeholder::before {
         @include big-play-button-triangle-size(27px);
       }
     }
 
-    .vjs-playback-rate {
-      display: none;
-    }
-
     .vjs-peertube {
       padding: 0 !important;
 
@@ -524,7 +561,7 @@
 
     .vjs-big-play-button {
       font-size: 3em;
-      border-width: 3px;
+      border-width: 2px;
 
       .vjs-icon-placeholder::before {
         @include big-play-button-triangle-size(20px);
@@ -608,4 +645,4 @@
   .vjs-error-display {
     display: block;
   }
-}
\ No newline at end of file
+}