Merge branch 'release/3.2.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 f801064285bede3585af21ff0b44909d02f9920b..c010f72975b392bafb9a080de6fa95deaeb44e85 100644 (file)
--- a/client/src/sass/player/peertube-skin.scss
+++ b/client/src/sass/player/peertube-skin.scss
@@ -17,10 +17,11 @@ body {
 
 .video-js.vjs-peertube-skin {
   font-size: $font-size;
-  color: var(--embedForegroundColor);
+  color: pvar(--embedForegroundColor);
 
   .vjs-dock-text {
-    padding-right: 10px;
+    padding: $dock-padding;
+    padding-right: 60px;
     background: linear-gradient(to bottom, rgba(0, 0, 0, .6) 0, rgba(0, 0, 0, 0.2) 70%, rgba(0, 0, 0, 0) 100%);
   }
 
@@ -42,10 +43,6 @@ body {
     }
   }
 
-  .vjs-button > .vjs-icon-placeholder::before {
-    line-height: $control-bar-height;
-  }
-
   .vjs-volume-level::before {
     content: ''; /* Remove Circle From Progress Bar */
   }
@@ -55,12 +52,12 @@ body {
   }
 
   .vjs-big-play-button {
-    outline: 0;
-    font-size: 6em;
-
     $big-play-width: 1.2em;
     $big-play-height: 1.2em;
 
+    outline: 0;
+    font-size: 6em;
+
     border: 2px solid #fff;
     border-radius: 100%;
 
@@ -75,7 +72,7 @@ body {
 
     &::-moz-focus-inner {
       border: 0;
-      padding: 0
+      padding: 0;
     }
 
     .vjs-icon-placeholder::before {
@@ -85,24 +82,29 @@ body {
       background-image: url('#{$assets-path}/player/images/big-play-button.svg');
     }
 
+    &.focus-visible,
     &:hover {
-      opacity: 0.8;
+      background-color: var(--mainColor, #696969);
     }
+
   }
 
   // Small effect when we click on the play button
   &.vjs-has-big-play-button-clicked {
 
-    .vjs-big-play-button, .vjs-poster {
+    .vjs-big-play-button,
+    .vjs-poster {
       display: block;
       visibility: hidden;
 
-      &.vjs-big-play-button, &.vjs-big-play-button::before {
+      &.vjs-big-play-button,
+      &.vjs-big-play-button::before {
         opacity: 0;
         transition: visibility 0.2s, opacity 0.2s;
       }
 
-      &.vjs-poster, &.vjs-poster::before {
+      &.vjs-poster,
+      &.vjs-poster::before {
         opacity: 0;
         transition: visibility 0.3s, opacity 0.3s;
         transition-delay: 0.05s;
@@ -122,6 +124,14 @@ body {
     }
   }
 
+  // Do not display poster when video is starting
+  &.vjs-has-autoplay:not(.vjs-has-started) {
+    .vjs-poster {
+      opacity: 0;
+      visibility: hidden;
+    }
+  }
+
   // Hide the big play button on autoplay
   &.vjs-has-autoplay {
     .vjs-big-play-button {
@@ -132,7 +142,7 @@ body {
   .vjs-control-bar,
   .vjs-big-play-button,
   .vjs-settings-dialog {
-    background-color: var(--embedBigPlayBackgroundColor);
+    background-color: pvar(--embedBigPlayBackgroundColor);
   }
 
   .vjs-poster {
@@ -146,6 +156,10 @@ body {
     box-shadow: 0 -15px 40px 10px rgba(0, 0, 0, 0.2);
     text-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
 
+    > button:first-child {
+      margin-left: $first-control-bar-element-margin-left;
+    }
+
     .vjs-progress-control,
     .vjs-play-control,
     .vjs-playback-rate,
@@ -155,9 +169,8 @@ body {
     .vjs-fullscreen-control,
     .vjs-peertube-link,
     .vjs-theater-control,
-    .vjs-settings
-    {
-      color: var(--embedForegroundColor) !important;
+    .vjs-settings {
+      color: pvar(--embedForegroundColor) !important;
 
       opacity: $primary-foreground-opacity;
       transition: opacity .1s;
@@ -170,7 +183,7 @@ body {
     .vjs-current-time,
     .vjs-duration,
     .vjs-peertube {
-      color: var(--embedForegroundColor);
+      color: pvar(--embedForegroundColor);
       opacity: $primary-foreground-opacity;
     }
 
@@ -190,7 +203,7 @@ body {
         transition: none;
 
         .vjs-play-progress {
-          background: var(--embedForegroundColor);
+          background: pvar(--embedForegroundColor);
 
           // Not display the circle if the progress is not hovered
           &::before {
@@ -207,7 +220,8 @@ body {
         }
 
         .vjs-load-progress {
-          &, & div {
+          &,
+          div {
             background: rgba(255, 255, 255, .2);
           }
         }
@@ -228,9 +242,19 @@ body {
       @include disable-outline;
 
       cursor: pointer;
-      font-size: $font-size;
-      margin-left: 1em;
-      width: 3em;
+      width: 2em;
+
+      .vjs-icon-placeholder {
+        line-height: $control-bar-height;
+        position: relative;
+        top: -1px;
+
+        &::before {
+          font-size: 28px;
+          line-height: unset;
+          position: relative;
+        }
+      }
     }
 
     .vjs-time-control {
@@ -243,10 +267,10 @@ body {
         margin-left: .5em;
 
         .vjs-current-time-display {
-          line-height: calc(#{$control-bar-height} + 1px);
+          line-height: calc(#{$control-bar-height} - 1px);
 
           &::after {
-            content: "/";
+            content: '/';
             margin: 0 1px 0 2px;
           }
         }
@@ -256,8 +280,9 @@ body {
         font-size: $font-size;
         display: inline-block;
         padding: 0;
+
         .vjs-duration-display {
-          line-height: calc(#{$control-bar-height} + 1px);
+          line-height: calc(#{$control-bar-height} - 1px);
         }
       }
 
@@ -266,11 +291,18 @@ body {
       }
     }
 
+    .vjs-live-control {
+      line-height: $control-bar-height;
+      min-width: 4em;
+      width: inherit;
+    }
+
     .vjs-peertube {
       width: 100%;
       line-height: $control-bar-height;
       text-align: right;
       margin-right: 6px;
+      overflow: hidden;
 
       .vjs-peertube-displayed {
         display: block;
@@ -280,11 +312,17 @@ body {
         display: none;
       }
 
-      .download-speed-number, .upload-speed-number, .peers-number, .http-fallback {
+      .download-speed-number,
+      .upload-speed-number,
+      .peers-number,
+      .http-fallback {
         font-weight: $font-semibold;
       }
 
-      .download-speed-text, .upload-speed-text, .peers-text, .http-fallback {
+      .download-speed-text,
+      .upload-speed-text,
+      .peers-text,
+      .http-fallback {
         margin-right: 15px;
       }
 
@@ -299,22 +337,32 @@ body {
       }
     }
 
-    .vjs-next-video {
+    .vjs-next-video,
+    .vjs-previous-video {
       line-height: $control-bar-height;
       text-align: right;
 
       .icon {
-        &.icon-next {
+        &.icon-next,
+        &.icon-previous {
           mask-image: url('#{$assets-path}/player/images/next.svg');
-          background-color: white;
+          -webkit-mask-image: url('#{$assets-path}/player/images/next.svg');
+
+          background-color: #fff;
           mask-size: cover;
-          transform: scale(2.2);
+          width: 11px;
+          height: 11px;
+          margin-top: -2px;
+          display: inline-block;
+        }
+
+        &.icon-previous {
+          transform: rotate(180deg);
         }
       }
     }
 
-    .vjs-peertube,
-    .vjs-next-video {
+    .vjs-peertube {
       .icon {
         display: inline-block;
         width: 15px;
@@ -344,7 +392,6 @@ body {
     .vjs-mute-control {
       @include disable-outline;
 
-      line-height: $control-bar-height;
       padding: 0;
       width: 30px;
 
@@ -373,7 +420,7 @@ body {
     }
 
     .vjs-volume-bar {
-      background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcCAQAAACw95UnAAAAMElEQVRIx2NgoBL4n4YKGUYNHkEG4zJg1OCRYDCpBowaPJwMppbLRg0eNXjUYBLEAXWNUA6QNm1lAAAAAElFTkSuQmCC) no-repeat;
+      background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcCAQAAACw95UnAAAAMElEQVRIx2NgoBL4n4YKGUYNHkEG4zJg1OCRYDCpBowaPJwMppbLRg0eNXjUYBLEAXWNUA6QNm1lAAAAAElFTkSuQmCC') no-repeat;
       background-size: 22px 14px;
       height: 100%;
       width: 100%;
@@ -384,7 +431,7 @@ body {
       top: 3px;
 
       .vjs-volume-level {
-        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcAQAAAAAyhWABAAAAAnRSTlMAAHaTzTgAAAAZSURBVHgBYwAB/g9EUv+JokCqiaT+U4MCAPKPS7WUUOc1AAAAAElFTkSuQmCC) no-repeat;
+        background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAcAQAAAAAyhWABAAAAAnRSTlMAAHaTzTgAAAAZSURBVHgBYwAB/g9EUv+JokCqiaT+U4MCAPKPS7WUUOc1AAAAAElFTkSuQmCC') no-repeat;
         background-size: 22px 14px;
         max-width: 22px;
         max-height: 14px;
@@ -467,7 +514,7 @@ body {
       @include disable-outline;
 
       width: 37px;
-      margin-right: 11px;
+      margin-right: $first-control-bar-element-margin-left;
 
       .vjs-icon-placeholder {
         display: inline-block;
@@ -552,9 +599,19 @@ body {
         display: none !important;
       }
     }
+
+    &.vjs-live {
+      .vjs-duration {
+        display: none !important;
+      }
+
+      .vjs-peertube {
+        display: none !important;
+      }
+    }
   }
 
-  @media screen and (max-width: 300px) {
+  @media screen and (max-width: 350px) {
     .vjs-dock-text {
       font-size: 13px;
     }
@@ -568,7 +625,9 @@ body {
       }
     }
 
-    .vjs-volume-control {
+    .vjs-volume-control,
+    .vjs-next-video,
+    .vjs-previous-video {
       display: none !important;
     }
 
@@ -579,6 +638,22 @@ body {
     .vjs-settings {
       width: 33px;
     }
+
+    .vjs-control-bar {
+      > button:first-child {
+        margin-left: $first-control-bar-element-margin-left-small-width;
+      }
+    }
+
+    .vjs-fullscreen-control {
+      margin-right: $first-control-bar-element-margin-left-small-width;
+    }
+
+    &.vjs-live {
+      .vjs-current-time {
+        display: none !important;
+      }
+    }
   }
 
   // Theater mode is enabled
@@ -646,3 +721,13 @@ body {
     display: block;
   }
 }
+
+.vjs-no-next-in-playlist {
+  .vjs-next-video {
+    cursor: default;
+
+    .icon {
+      background-color: rgba(255, 255, 255, 0.5);
+    }
+  }
+}