Fix regression in theater mode

[oweals/peertube.git] / client / src / app / videos / +video-watch / video-watch.component.scss

diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index eb701e0abac6d51587f1a6b24536680ce11edcef..a2d56bd39b2f4729a7e96937611eef62f59984f1 100644 (file)
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -1,17 +1,39 @@
 @import '_variables';
 @import '_mixins';
 
-#video-container {
+#video-element-wrapper {
   background-color: #000;
   display: flex;
   justify-content: center;
 
-  #video-element {
+  .remote-server-down {
+    color: #fff;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+    justify-content: center;
+    background-color: #141313;
+    width: 100%;
+    font-size: 24px;
+    height: 500px;
+
+    @media screen and (max-width: 1000px) {
+      font-size: 20px;
+    }
+
+    @media screen and (max-width: 600px) {
+      font-size: 16px;
+    }
+  }
+
+  /deep/ .video-js {
     width: 888px;
     height: 500px;
 
-    @media screen and (max-width: 800px) {
-      height: auto;
+    &.vjs-theater-enabled {
+      height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
+      width: 100%;
     }
 
     // VideoJS create an inner video player
@@ -20,6 +42,18 @@
       position: relative !important;
     }
   }
+
+  @media screen and (max-width: 600px) {
+    .remote-server-down,
+    /deep/ .video-js {
+      width: 100vw;
+      height: calc(100vw / 1.7); // 16/9
+    }
+  }
+}
+
+.alert {
+  text-align: center;
 }
 
 #video-not-found {
@@ -37,7 +71,9 @@
 
   .video-info {
     flex-grow: 1;
-    margin-right: 28px;
+    margin-right: 40px;
+    // Set min width for flex item
+    min-width: 1px;
 
     .video-info-first-row {
       display: flex;
@@ -63,20 +99,53 @@
       .video-info-channel {
         font-weight: $font-semibold;
         font-size: 15px;
+
+        a {
+          @include disable-default-a-behaviour;
+
+          color: #000;
+
+          &:hover {
+            opacity: 0.8;
+          }
+
+          img {
+            @include avatar(18px);
+
+            margin: -2px 2px 0 5px;
+          }
+        }
+
+        my-help {
+          display: inline-block;
+        }
       }
 
-      .video-info-by {
-        display: flex;
+      .video-info-by a {
+        @include disable-default-a-behaviour;
+
+        display: inline;
         align-items: center;
         font-size: 13px;
+        color: #000;
+
+        span:hover {
+          opacity: 0.8;
+        }
 
         img {
           @include avatar(18px);
 
+          margin-top: -2px;
           margin-left: 7px;
         }
       }
 
+      my-video-feed {
+        margin-left: 5px;
+        margin-top: 1px;
+      }
+
       .video-actions-rates {
         display: flex;
         flex-direction: column;
@@ -129,8 +198,8 @@
               }
             }
 
-            &.action-button-share {
-              width: 82px;
+            .icon-text {
+              margin-left: 3px;
             }
 
             &.action-button-like.activated {
@@ -202,7 +271,11 @@
       font-size: 15px;
 
       .video-info-description-html {
-        word-break: break-all;
+        @include peertube-word-wrap;
+      }
+
+      .glyphicon, .description-loading {
+        margin-left: 3px;
       }
 
       .description-loading {
@@ -237,6 +310,8 @@
   }
 
   .other-videos {
+    padding-left: 1em;
+
     .title-page {
       margin-top: 0;
     }
@@ -245,19 +320,73 @@
       display: flex;
       height: 100%;
       margin-bottom: 20px;
+      flex-wrap: wrap;
 
       .video-miniature-information {
-        margin-left: 10px;
+        flex-grow: 1;
       }
     }
   }
 }
 
+// If the view is not expanded, take into account the menu
+.privacy-concerns {
+  width: calc(100% - #{$menu-width});
+}
+
+:host-context(.expanded) {
+  .privacy-concerns {
+    width: 100%;
+  }
+}
+
+.privacy-concerns {
+  position: fixed;
+  bottom: 0;
+
+  padding: 5px 15px;
+
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  background-color: rgba(0, 0, 0, 0.9);
+  color: #fff;
+
+  .privacy-concerns-text {
+    margin: 0 5px;
+  }
+
+  a {
+    @include disable-default-a-behaviour;
+
+    color: $orange-color;
+    transition: color 0.3s;
+
+    &:hover {
+      color: #fff;
+    }
+  }
+
+  .privacy-concerns-okay {
+    background-color: $orange-color;
+    padding: 5px 8px 5px 7px;
+    margin-left: auto;
+    border-radius: 3px;
+    cursor: pointer;
+    transition: background-color 0.3s;
+    font-weight: $font-semibold;
+
+    &:hover {
+      background-color: #000;
+    }
+  }
+}
+
 
 @media screen and (max-width: 1600px) {
   .video-bottom {
     .video-info {
-      margin-right: 0;
+      margin-right: 20px;
 
       .video-info-first-row {
         flex-direction: column;
@@ -265,7 +394,7 @@
 
         .video-actions-rates {
           margin-top: 20px;
-          align-items: left;
+          align-items: start;
 
           .video-info-likes-dislikes-bar {
             margin-top: 10px;
@@ -289,9 +418,26 @@
   }
 }
 
-@media screen and (max-width: 1200px) {
+@media screen and (max-width: 1300px) {
+  .video-bottom {
+    flex-direction: column;
+  }
+
   .other-videos {
-    display: none;
+    padding-left: 0;
+
+    /deep/ .video-miniature .video-miniature-information {
+      margin-left: 10px;
+    }
+  }
+
+  .privacy-concerns {
+    font-size: 12px;
+    padding: 2px 5px;
+
+    .privacy-concerns-text {
+      margin: 0;
+    }
   }
 }
 
@@ -310,6 +456,14 @@
       }
     }
   }
+
+  .privacy-concerns {
+    width: 100%;
+
+    strong {
+      display: none;
+    }
+  }
 }
 
 @media screen and (max-width: 450px) {