X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=633b16c05a664417a550b8ac8a27dc4957849902;hb=2303a803aa19c2857efac9f2af2223ccae5757e2;hp=d963f713dbf73dd4327c235084b67dba9a91a859;hpb=1f788f2044928325e48c5d88ecbc72501873558e;p=github%2FChocobozzz%2FPeerTube.git

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 d963f713d..633b16c05 100644
--- 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,48 @@
 @import '_variables';
 @import '_mixins';
 
-#video-container {
+.root-row {
+  flex-direction: column;
+}
+
+.blacklisted-label {
+  font-weight: $font-semibold;
+}
+
+#video-element-wrapper {
   background-color: #000;
   display: flex;
   justify-content: center;
+  flex-grow: 1;
+
+  .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;
+    }
 
-  #video-element {
+    @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 +51,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 {
@@ -33,22 +76,22 @@
 
 .video-bottom {
   margin-top: 40px;
-  display: flex;
 
   .video-info {
     flex-grow: 1;
-    margin-right: 28px;
+    // Set min width for flex item
+    min-width: 1px;
 
     .video-info-first-row {
       display: flex;
 
-      & > div {
+      & > div:first-child {
         flex-grow: 1;
       }
 
       .video-info-name {
         margin-right: 30px;
-        height: 40px; // Align with the action buttons
+        min-height: 40px; // Align with the action buttons
         font-size: 27px;
         font-weight: $font-semibold;
         flex-grow: 1;
@@ -63,28 +106,69 @@
       .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-subscribe-button {
+          margin-left: 5px;
+        }
       }
 
       .video-info-by {
-        display: flex;
-        align-items: center;
-        font-size: 13px;
 
-        img {
-          @include avatar(18px);
+        a {
+          @include disable-default-a-behaviour;
 
-          margin-left: 7px;
+          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-help {
+          position: relative;
+          top: 1px;
+          margin-left: 2px;
         }
       }
 
+      my-video-feed {
+        margin-left: 5px;
+        margin-top: 1px;
+      }
+
       .video-actions-rates {
-        display: flex;
-        flex-direction: column;
-        align-items: end;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        align-items: start;
 
         .video-actions {
           height: 40px; // Align with the title
-          min-width: 215px;
           display: flex;
           align-items: center;
 
@@ -100,6 +184,11 @@
             font-weight: $font-semibold;
             display: inline-block;
             padding: 0 10px 0 10px;
+            white-space: nowrap;
+
+            &::after {
+              display: none;
+            }
 
             .icon {
               @include icon(21px);
@@ -115,6 +204,10 @@
                 background-image: url('../../../assets/images/video/dislike-grey.svg');
               }
 
+              &.icon-support {
+                background-image: url('../../../assets/images/video/heart.svg');
+              }
+
               &.icon-share {
                 background-image: url('../../../assets/images/video/share.svg');
               }
@@ -125,8 +218,12 @@
               }
             }
 
+            .icon-text {
+              margin-left: 3px;
+            }
+
             &.action-button-like.activated {
-              background-color: #39CC0B;
+              background-color: $green;
 
               .icon-like {
                 background-image: url('../../../assets/images/video/like-white.svg');
@@ -134,7 +231,7 @@
             }
 
             &.action-button-dislike.activated {
-              background-color: #FF0000;
+              background-color: $red;
 
               .icon-dislike {
                 background-image: url('../../../assets/images/video/dislike-white.svg');
@@ -170,16 +267,27 @@
                 &.icon-blacklist {
                   background-image: url('../../../assets/images/video/blacklist.svg');
                 }
+
+                &.icon-unblacklist {
+                  background-image: url('../../../assets/images/global/undo.svg');
+                }
+
+                &.icon-delete {
+                  background-image: url('../../../assets/images/global/delete-black.svg');
+                }
               }
             }
           }
         }
 
         .video-info-likes-dislikes-bar {
-          height: 5px;
+          $likes-bar-height: 2px;
+          height: $likes-bar-height;
+          margin-top: -$likes-bar-height;
           width: 186px;
           background-color: #E5E5E5;
-          margin-top: 25px;
+          position: relative;
+          top: 10px;
 
           .likes-bar {
             height: 100%;
@@ -193,6 +301,14 @@
       margin: 20px 0;
       font-size: 15px;
 
+      .video-info-description-html {
+        @include peertube-word-wrap;
+      }
+
+      .glyphicon, .description-loading {
+        margin-left: 3px;
+      }
+
       .description-loading {
         display: inline-block;
       }
@@ -216,53 +332,116 @@
       margin-bottom: 12px;
 
       .video-attribute-label {
-        width: 86px;
+        min-width: 91px;
+        padding-right: 5px;
         display: inline-block;
         color: #585858;
         font-weight: $font-bold;
       }
+
+      a.video-attribute-value {
+        @include disable-default-a-behaviour;
+        color: #000;
+
+        &:hover {
+          opacity: 0.9;
+        }
+      }
+
+      &.video-attribute-tags {
+        .video-attribute-value:not(:nth-child(2)) {
+          &::before {
+            content: ', '
+          }
+        }
+      }
     }
   }
 
-  .other-videos {
+  /deep/ .other-videos {
+    padding-left: 1em;
+
     .title-page {
-      margin-top: 0;
+      margin-top: 0 !important;
     }
 
     /deep/ .video-miniature {
       display: flex;
       height: 100%;
       margin-bottom: 20px;
+      flex-wrap: wrap;
 
       .video-miniature-information {
-        margin-left: 10px;
+        flex-grow: 1;
+      }
+
+      .video-thumbnail {
+        margin-right: 10px
       }
     }
   }
 }
 
+// If the view is not expanded, take into account the menu
+.privacy-concerns {
+  width: calc(100% - #{$menu-width});
+}
 
-@media screen and (max-width: 1300px) {
-  .other-videos {
-    display: none;
+: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;
-
       .video-info-first-row {
         flex-direction: column;
-        margin-bottom: 30px;
-
-        .video-actions-rates {
-          margin-top: 20px;
-          align-items: left;
-
-          .video-info-likes-dislikes-bar {
-            margin-top: 10px;
-          }
-        }
+        margin-bottom: 20px;
       }
 
       .video-info-date-views {
@@ -281,6 +460,25 @@
   }
 }
 
+@media screen and (max-width: 1300px) {
+  .video-bottom {
+    flex-direction: column;
+  }
+
+  /deep/ .other-videos {
+    padding-left: 0 !important;
+  }
+
+  .privacy-concerns {
+    font-size: 12px;
+    padding: 2px 5px;
+
+    .privacy-concerns-text {
+      margin: 0;
+    }
+  }
+}
+
 @media screen and (max-width: 600px) {
   .video-bottom {
     margin: 20px 0 0 0;
@@ -296,4 +494,24 @@
       }
     }
   }
+
+  /deep/ .other-videos {
+    /deep/ .video-miniature  {
+      flex-direction: column;
+    }
+  }
+
+  .privacy-concerns {
+    width: 100%;
+
+    strong {
+      display: none;
+    }
+  }
+}
+
+@media screen and (max-width: 450px) {
+  .video-bottom  .action-button .icon-text {
+    display: none !important;
+  }
 }