X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fvideo-js-custom.scss;h=88af9cbc5b365f16fe41989deb214baf1119acb6;hb=3ec8dc096276ac3c7e5d8dca5f100017516f62ec;hp=2fcfc6203dd057f1ba7ba7d13f367296e9076797;hpb=a86309b4af9ad8391822f628d74fc5c7d1a01974;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/video-js-custom.scss b/client/src/sass/video-js-custom.scss
index 2fcfc6203..88af9cbc5 100644
--- a/client/src/sass/video-js-custom.scss
+++ b/client/src/sass/video-js-custom.scss
@@ -1,4 +1,6 @@
-// Thanks: https://github.com/zanechua/videojs-sublime-inspired-skin
+@import '_variables';
+@import '_mixins';
+
 $primary-foreground-color: #fff;
 $primary-background-color: #000;
 $font-size: 13px;
@@ -8,6 +10,28 @@ $control-bar-height: 34px;
   font-size: $font-size;
   color: $primary-foreground-color;
 
+  .vjs-dock-text {
+    padding-right: 10px;
+  }
+
+  .vjs-dock-description {
+    font-size: 11px;
+
+    &:before, &:after {
+      display: inline-block;
+      content: '\1F308';
+    }
+
+    &:before {
+      margin-right: 4px;
+    }
+
+    &:after {
+      margin-left: 4px;
+      transform: scale(-1, 1);
+    }
+  }
+
   .vjs-button > .vjs-icon-placeholder::before {
     line-height: $control-bar-height;
   }
@@ -23,26 +47,47 @@ $control-bar-height: 34px;
   }
 
   .vjs-big-play-button {
-    font-size: 8em;
-
-    $big-play-width: 3em;
-    $big-play-height: 1.5em;
+    outline: 0;
+    font-size: 6em;
 
-    line-height: $big-play-height;
-    height: $big-play-height;
-    width: $big-play-width;
+    $big-play-width: 1.5em;
+    $big-play-height: 1em;
 
     border: 0;
     border-radius: 0.3em;
 
     left: 50%;
     top: 50%;
+    width: $big-play-width;
+    height: $big-play-height;
+    line-height: $big-play-height;
     margin-left: -($big-play-width / 2);
     margin-top: -($big-play-height / 2);
+    transition: opacity 0.5s;
+
+    &::-moz-focus-inner {
+      border: 0;
+      padding: 0
+    }
+
+    .vjs-icon-placeholder::before {
+      transition: text-shadow 0.3s;
+    }
+
+    &:hover {
+      opacity: 0.9;
+
+      .vjs-icon-placeholder::before {
+        text-shadow: 0 0 1px rgba(255, 255, 255, 0.8);
+      }
+    }
   }
 
-  &:hover .vjs-big-play-button {
-    background-color: transparent;
+  &.vjs-has-started .vjs-big-play-button {
+    display: block;
+    visibility: hidden;
+    opacity: 0;
+    transition: visibility 0.3s, opacity 0.3s;
   }
 
   .vjs-control-bar,
@@ -96,6 +141,8 @@ $control-bar-height: 34px;
     }
 
     .vjs-play-control {
+      @include disable-outline;
+
       font-size: $font-size;
       padding: 0 17px;
       margin-right: 5px;
@@ -108,7 +155,7 @@ $control-bar-height: 34px;
         padding: 0;
 
         .vjs-current-time-display {
-          line-height: $control-bar-height;
+          line-height: calc(#{$control-bar-height} + 1px);
 
           &::after {
             content: "/";
@@ -123,7 +170,7 @@ $control-bar-height: 34px;
         padding: 0;
 
         .vjs-duration-display {
-          line-height: $control-bar-height;
+          line-height: calc(#{$control-bar-height} + 1px);
         }
       }
 
@@ -132,17 +179,16 @@ $control-bar-height: 34px;
       }
     }
 
-    .vjs-webtorrent {
+    .vjs-peertube {
       width: 100%;
       line-height: $control-bar-height;
       text-align: right;
-      padding-right: 60px;
 
-      .vjs-webtorrent-displayed {
+      .vjs-peertube-displayed {
         display: block;
       }
 
-      .vjs-webtorrent-hidden {
+      .vjs-peertube-hidden {
         display: none;
       }
 
@@ -175,7 +221,27 @@ $control-bar-height: 34px;
       }
     }
 
+    .vjs-playback-rate {
+      font-size: 10px;
+      width: 37px !important;
+
+      .vjs-playback-rate-value {
+        font-size: 13px;
+        line-height: $control-bar-height;
+      }
+
+      .vjs-menu .vjs-menu-content {
+        width: 37px !important;
+      }
+    }
+
     .vjs-mute-control {
+      @include disable-outline;
+
+      line-height: $control-bar-height;
+      padding: 0;
+      width: 30px;
+
       .vjs-icon-placeholder {
         display: inline-block;
         width: 22px;
@@ -195,12 +261,9 @@ $control-bar-height: 34px;
       }
     }
 
-    .vjs-volume-menu-button,
-    .vjs-volume-panel {
-      width: 6em;
-      position: absolute;
-      right: 0;
-      margin-right: 65px;
+    .vjs-volume-control {
+      width: 30px;
+      margin: 0;
     }
 
     .vjs-volume-bar {
@@ -258,6 +321,8 @@ $control-bar-height: 34px;
     }
 
     .vjs-fullscreen-control {
+      @include disable-outline;
+
       width: 37px;
 
       .vjs-icon-placeholder {
@@ -275,33 +340,33 @@ $control-bar-height: 34px;
     }
 
     .vjs-menu-button-popup {
-      font-size: 13px;
       font-weight: $font-semibold;
-      width: 42px;
+      width: 50px;
 
       // Thanks: https://github.com/kmoskwiak/videojs-resolution-switcher/pull/92/files
       .vjs-resolution-button-label {
         line-height: $control-bar-height;
         position: absolute;
         top: 0;
-        left: -1px;
+        left: 0;
         width: 100%;
         height: 100%;
         text-align: center;
         box-sizing: inherit;
+        text-align: center;
       }
 
       .vjs-resolution-button {
-        outline: 0 !important;
+        @include disable-outline;
       }
 
       .vjs-menu {
         top: 20px;
+        left: 0;
 
         .vjs-menu-content {
-          width: 4em;
-          left: 50%; /* Center the menu, in it's parent */
-          margin-left: -2em; /* half of width, to center */
+          width: 50px;
+          bottom: 20px;
         }
 
         li {
@@ -312,27 +377,59 @@ $control-bar-height: 34px;
     }
   }
 
-  @media screen and (max-width: 450px) {
-    .vjs-webtorrent-displayed {
+  @media screen and (max-width: 550px) {
+    .vjs-big-play-button {
+      font-size: 5em;
+    }
+
+    .vjs-playback-rate {
+      display: none;
+    }
+
+    .vjs-peertube {
+      padding: 0 !important;
+
+      .vjs-peertube-displayed {
+        display: none !important;
+      }
+    }
+  }
+
+  @media screen and (max-width: 300px) {
+    .vjs-dock-text {
+      font-size: 13px;
+    }
+
+    .vjs-dock-description {
+      font-size: 9px;
+    }
+
+    .vjs-big-play-button {
+      font-size: 4em;
+    }
+
+    .vjs-volume-control {
       display: none !important;
     }
+
+    .vjs-volume-panel {
+      width: 26px !important;
+      margin-right: 83px !important;
+    }
   }
 }
 
 // Thanks: https://projects.lukehaas.me/css-loaders/
 .vjs-loading-spinner {
-  margin: 0 !important;
-  //position: absolute;
-  // 15px is the nav bar height
-  top: calc(50% - 15px);
   left: 50%;
   font-size: 10px;
-  position: relative;
   text-indent: -9999em;
   border: 0.7em solid rgba(255, 255, 255, 0.2);
   border-left-color: #ffffff;
   transform: translateZ(0);
-  animation: spinner 1.4s infinite linear;
+  animation: 0.3s ease-out 1.1s forwards vjs-spinner-show, spinner 1.4s infinite linear !important;
+  overflow: hidden;
+  visibility: hidden;
 
   &:before {
     animation: none !important;
@@ -353,5 +450,41 @@ $control-bar-height: 34px;
       transform: rotate(360deg);
     }
   }
+
+  @keyframes vjs-spinner-show {
+    0% {
+      display: none;
+      opacity: 0;
+    }
+
+    1% {
+      display: block;
+      visibility: visible;
+      opacity: 0;
+    }
+
+    100% {
+      display: block;
+      visibility: visible;
+      opacity: 1;
+    }
+  }
+}
+
+// Error display disabled
+.vjs-error:not(.vjs-error-display-enabled) {
+  .vjs-error-display {
+    display: none;
+  }
+
+  .vjs-loading-spinner {
+    display: block;
+  }
 }
 
+// Error display enabled
+.vjs-error.vjs-error-display-enabled {
+  .vjs-error-display {
+    display: block;
+  }
+}