Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / sass / player / control-bar.scss

diff --git a/client/src/sass/player/control-bar.scss b/client/src/sass/player/control-bar.scss
index 2f76e599fa27f49bf864b85ae2bed8e44d128423..6271523af99e394d0d360bfdfcbf43a570863f6e 100644 (file)
--- a/client/src/sass/player/control-bar.scss
+++ b/client/src/sass/player/control-bar.scss
@@ -4,12 +4,18 @@
 @use './_player-variables' as *;
 
 .video-js.vjs-peertube-skin .vjs-control-bar {
+  z-index: 100;
+
   height: $control-bar-height;
   background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.6));
   box-shadow: 0 -15px 40px 10px rgba(0, 0, 0, 0.2);
   text-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
   transition: visibility 0.3s, opacity 0.3s !important;
 
+  &.control-bar-hidden {
+    display: none !important;
+  }
+
   > button:first-child {
     @include margin-left($first-control-bar-element-margin-left);
   }
@@ -49,10 +55,10 @@
     @include margin-left($progress-margin);
 
     position: absolute;
-    top: -10px;
+    top: $control-bar-slider-top;
     z-index: 100; // On top of the progress bar
     width: calc(100% - (2 * #{$progress-margin}));
-    height: 14px;
+    height: 20px;
 
     .vjs-slider {
       margin: 0;
@@ -104,7 +110,9 @@
 
     .vjs-icon-placeholder::before {
       font-size: $control-bar-play-font-size;
-      line-height: initial;
+      line-height: unset;
+      position: relative;
+      top: -1px;
     }
   }
 
@@ -401,6 +409,14 @@
     .vjs-theater-control {
       display: none;
     }
+
+    .vjs-peertube {
+      .icon,
+      .download-speed-text,
+      .upload-speed-text {
+        display: none !important;
+      }
+    }
   }
 
   @media screen and (max-width: $screen-width-570) {