X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=2874847cd31c2d6f26487197eae03bd00a69941a;hb=11dd0c2e4202e7ad68d8b7e6706de846401d29ff;hp=7ebdfc0c4b7fffc8726e54f8579069a46f55d803;hpb=cf117aaafc1e9ae1ab4c388fc5d2e5ba9349efee;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 7ebdfc0c4..2874847cd 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -1,18 +1,132 @@
 @import '_variables';
 @import '_mixins';
+@import '_bootstrap-variables';
+@import '_miniature';
 
-#video-container {
+$other-videos-width: 260px;
+$player-factor: 1.7; // 16/9
+
+@function getPlayerHeight($width){
+  @return calc(#{$width} / #{$player-factor})
+}
+
+@function getPlayerWidth($height){
+  @return calc(#{$height} * #{$player-factor})
+}
+
+@mixin playlist-below-player {
+  width: 100%;
+  border-bottom: 1px solid $separator-border-color;
+}
+
+.root {
+  &.theater-enabled #video-wrapper {
+    flex-direction: column;
+    justify-content: center;
+
+    #videojs-wrapper {
+      width: 100%;
+    }
+
+    /deep/ .video-js {
+      $height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
+
+      height: $height;
+      width: 100%;
+    }
+
+    .playlist {
+      @include playlist-below-player;
+    }
+  }
+}
+
+.blacklisted-label {
+  font-weight: $font-semibold;
+}
+
+#video-wrapper {
   background-color: #000;
   display: flex;
   justify-content: center;
-
-  #video-element {
-    width: 888px;
+  margin: 0 -15px;
+
+  .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: 800px) {
-      height: auto;
+    @media screen and (max-width: 1000px) {
+      font-size: 20px;
+    }
+
+    @media screen and (max-width: 600px) {
+      font-size: 16px;
     }
+  }
+
+  .playlist {
+    width: 400px;
+    height: 66vh;
+    background-color: var(--mainBackgroundColor);
+    overflow-y: auto;
+
+    .playlist-info {
+      padding: 5px 30px;
+      background-color: #e4e4e4;
+
+      .playlist-display-name {
+        font-size: 18px;
+        font-weight: $font-semibold;
+        margin-bottom: 5px;
+      }
+
+      .playlist-by-index {
+        color: $grey-foreground-color;
+        display: flex;
+
+        .playlist-by {
+          margin-right: 5px;
+        }
+
+        .playlist-index span:first-child::after {
+          content: '/';
+          margin: 0 3px;
+        }
+      }
+    }
+
+    my-video-playlist-element-miniature {
+      /deep/ {
+        .video {
+          .position {
+            margin-right: 0;
+          }
+
+          .video-info {
+            .video-info-name {
+              font-size: 15px;
+            }
+          }
+        }
+
+        my-video-thumbnail {
+          @include thumbnail-size-component(90px, 50px);
+        }
+      }
+    }
+  }
+
+  /deep/ .video-js {
+    width: getPlayerWidth(66vh);
+    height: 66vh;
 
     // VideoJS create an inner video player
     video {
@@ -20,6 +134,18 @@
       position: relative !important;
     }
   }
+
+  @media screen and (max-width: 600px) {
+    .remote-server-down,
+    /deep/ .video-js {
+      width: 100vw;
+      height: getPlayerHeight(100vw)
+    }
+  }
+}
+
+.alert {
+  text-align: center;
 }
 
 #video-not-found {
@@ -32,159 +158,190 @@
 }
 
 .video-bottom {
-  margin-top: 40px;
   display: flex;
+  margin-top: 40px;
 
   .video-info {
     flex-grow: 1;
-    margin-right: 28px;
+    // Set min width for flex item
+    min-width: 1px;
+    max-width: 100%;
 
-    .video-info-name-actions {
+    .video-info-first-row {
       display: flex;
-      align-items: center;
+
+      & > div:first-child {
+        flex-grow: 1;
+      }
 
       .video-info-name {
         margin-right: 30px;
+        min-height: 40px; // Align with the action buttons
         font-size: 27px;
         font-weight: $font-semibold;
         flex-grow: 1;
       }
 
-      .video-info-actions {
-        min-width: 215px;
-        display: flex;
-        justify-content: end;
+      .video-info-date-views {
+        flex-grow: 1;
+        margin-bottom: 10px;
+        margin-right: 10px;
+        font-size: 16px;
+      }
 
-        .action-button:not(:first-child), .action-more {
-          margin-left: 10px;
-        }
+      .video-info-channel {
+        font-weight: $font-semibold;
+        font-size: 15px;
 
-        .action-button {
-          @include peertube-button;
-          @include grey-button;
+        a {
+          @include disable-default-a-behaviour;
 
-          font-size: 15px;
-          font-weight: $font-semibold;
-          display: inline-block;
-          padding: 0 10px 0 10px;
+          color: var(--mainForegroundColor);
 
-          .icon {
-            @include icon(21px);
+          &:hover {
+            opacity: 0.8;
+          }
 
-            position: relative;
-            top: -2px;
+          img {
+            @include avatar(18px);
 
-            &.icon-like {
-              background-image: url('../../../assets/images/video/like-grey.svg');
-            }
+            margin: -2px 2px 0 5px;
+          }
+        }
 
-            &.icon-dislike {
-              background-image: url('../../../assets/images/video/dislike-grey.svg');
-            }
+        my-subscribe-button {
+          margin-left: 5px;
+        }
+      }
 
-            &.icon-share {
-              background-image: url('../../../assets/images/video/share.svg');
-            }
+      .video-info-by {
 
-            &.icon-more {
-              background-image: url('../../../assets/images/video/more.svg');
-              top: -1px;
-            }
-          }
+        a {
+          @include disable-default-a-behaviour;
 
-          &.action-button-like.activated {
-            background-color: #39CC0B;
+          display: inline;
+          align-items: center;
+          font-size: 13px;
+          color: var(--mainForegroundColor);
 
-            .icon-like {
-              background-image: url('../../../assets/images/video/like-white.svg');
-            }
+          span:hover {
+            opacity: 0.8;
           }
 
-          &.action-button-dislike.activated {
-            background-color: #FF0000;
+          img {
+            @include avatar(18px);
 
-            .icon-dislike {
-              background-image: url('../../../assets/images/video/dislike-white.svg');
-            }
+            margin-top: -2px;
+            margin-left: 7px;
           }
         }
 
-        .action-more {
-          display: inline-block;
+        my-help {
+          position: relative;
+          top: 1px;
+          margin-left: 2px;
+        }
+      }
 
-          .dropdown-menu .dropdown-item {
-            padding: 6px 24px;
+      my-feed {
+        margin-left: 5px;
+        margin-top: 1px;
+      }
 
-            .icon {
-              @include icon(24px);
+      .video-actions-rates {
+        margin: 20px 0 10px 0;
+        align-items: start;
 
-              margin-right: 10px;
-              position: relative;
-              top: -1px;
+        .video-actions {
+          height: 40px; // Align with the title
+          display: flex;
+          align-items: center;
 
-              &.icon-download {
-                background-image: url('../../../assets/images/video/download-black.svg');
-              }
+          .action-button:not(:first-child), .action-dropdown {
+            margin-left: 10px;
+          }
 
-              &.icon-edit {
-                background-image: url('../../../assets/images/global/edit-black.svg');
+          .action-button {
+            @include peertube-button;
+            @include grey-button;
+            @include button-with-icon(21px, 0, -1px);
+            @include apply-svg-color($grey-foreground-color);
+
+            font-size: 15px;
+            font-weight: $font-semibold;
+            display: inline-block;
+            padding: 0 10px 0 10px;
+            white-space: nowrap;
+
+            &::after {
+              display: none;
+            }
+
+            &.action-button-like.activated {
+              background-color: $green;
+
+              my-global-icon {
+                @include apply-svg-color(#fff);
               }
+            }
 
-              &.icon-alert {
-                background-image: url('../../../assets/images/video/alert.svg');
+            &.action-button-dislike.activated {
+              background-color: $red;
+
+              my-global-icon {
+                @include apply-svg-color(#fff);
               }
+            }
 
-              &.icon-blacklist {
-                background-image: url('../../../assets/images/video/blacklist.svg');
+            &.action-button-save {
+              my-global-icon {
+                top: 0 !important;
+                right: -1px;
               }
             }
+
+            .icon-text {
+              margin-left: 3px;
+            }
           }
-        }
-      }
-    }
 
-    .video-info-date-views-bar {
-      display: flex;
+          .action-dropdown {
+            display: inline-block;
 
-      .video-info-date-views {
-        font-size: 16px;
-        margin-bottom: 10px;
-        flex-grow: 1;
-      }
+            .dropdown-menu .dropdown-item {
+              @include dropdown-with-icon-item;
+            }
+          }
+        }
 
-      .video-info-likes-dislikes-bar {
-        height: 5px;
-        width: 186px;
-        background-color: #E5E5E5;
-        margin-top: 25px;
+        .video-info-likes-dislikes-bar {
+          $likes-bar-height: 2px;
+          height: $likes-bar-height;
+          margin-top: -$likes-bar-height;
+          width: 186px;
+          background-color: $red;
+          position: relative;
+          top: 10px;
 
-        .likes-bar {
-          height: 100%;
-          background-color: #39CC0B;
+          .likes-bar {
+            height: 100%;
+            background-color: $green;
+          }
         }
       }
     }
 
-    .video-info-channel {
-      font-weight: $font-semibold;
+    .video-info-description {
+      margin: 20px 0;
       font-size: 15px;
-    }
 
-    .video-info-by {
-      display: flex;
-      align-items: center;
-      font-size: 13px;
-
-      img {
-        @include avatar(18px);
-
-        margin-left: 7px;
+      .video-info-description-html {
+        @include peertube-word-wrap;
       }
-    }
 
-    .video-info-description {
-      margin: 20px 0;
-      font-size: 15px;
+      .glyphicon, .description-loading {
+        margin-left: 3px;
+      }
 
       .description-loading {
         display: inline-block;
@@ -193,7 +350,7 @@
       .video-info-description-more {
         cursor: pointer;
         font-weight: $font-semibold;
-        color: #585858;
+        color: $grey-foreground-color;
         font-size: 14px;
 
         .glyphicon {
@@ -203,70 +360,226 @@
       }
     }
 
-    .video-attributes {
-      .video-attribute {
-        font-size: 13px;
-        display: block;
-        margin-bottom: 12px;
-
-        .video-attribute-label {
-          width: 86px;
-          display: inline-block;
-          color: #585858;
-          font-weight: $font-bold;
+    .video-attributes .video-attribute {
+      font-size: 13px;
+      display: block;
+      margin-bottom: 12px;
+
+      .video-attribute-label {
+        min-width: 142px;
+        padding-right: 5px;
+        display: inline-block;
+        color: $grey-foreground-color;
+        font-weight: $font-bold;
+      }
+
+      a.video-attribute-value {
+        @include disable-default-a-behaviour;
+        color: var(--mainForegroundColor);
+
+        &:hover {
+          opacity: 0.9;
+        }
+      }
+
+      &.video-attribute-tags {
+        .video-attribute-value:not(:nth-child(2)) {
+          &::before {
+            content: ', '
+          }
         }
       }
     }
   }
 
-  .other-videos {
+  /deep/ .other-videos {
+    padding-left: 15px;
+    flex-basis: $other-videos-width;
+
     .title-page {
-      margin-top: 0;
+      margin-top: 0 !important;
     }
 
-    /deep/ .video-miniature {
+    .video-miniature {
       display: flex;
+      width: $other-videos-width;
       height: 100%;
       margin-bottom: 20px;
+      flex-wrap: wrap;
 
-      .video-miniature-information {
-        margin-left: 10px;
+      .video-thumbnail {
+        margin-right: 10px
       }
     }
   }
 }
 
+my-video-comments {
+  display: inline-block;
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+// If the view is not expanded, take into account the menu
+.privacy-concerns {
+  width: calc(100% - #{$menu-width});
+}
+
+@media screen and (max-width: $small-view) {
+  .privacy-concerns {
+    margin-left: $menu-width;
+  }
+}
+
+:host-context(.expanded) {
+  .privacy-concerns {
+    width: 100%;
+    margin-left: 0;
+  }
+}
+
+.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: var(--mainColor);
+    transition: color 0.3s;
+
+    &:hover {
+      color: #fff;
+    }
+  }
+
+  .privacy-concerns-okay {
+    background-color: var(--mainColor);
+    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 .video-attributes .video-attribute {
+    margin-bottom: 5px;
+  }
+}
 
 @media screen and (max-width: 1300px) {
-  .other-videos {
-    display: none;
+  .privacy-concerns {
+    font-size: 12px;
+    padding: 2px 5px;
+
+    .privacy-concerns-text {
+      margin: 0;
+    }
   }
+}
 
+@media screen and (max-width: 1100px) {
   .video-bottom {
-    .video-info {
-      margin-right: 0;
+    flex-direction: column;
 
-      .video-info-name-actions {
-        align-items: left;
-        flex-direction: column;
-        margin-bottom: 30px;
+    /deep/ .other-videos {
+      padding-left: 0 !important;
+
+      /deep/ .video-miniature  {
+        flex-direction: row;
+        width: auto;
       }
+    }
+  }
+}
 
-      .video-info-date-views-bar {
-        align-items: left;
-        flex-direction: column;
-        margin-bottom: 30px;
+@media screen and (max-width: 900px) {
+  #video-wrapper {
+    flex-direction: column;
+    justify-content: center;
 
-        .video-info-likes-dislikes-bar {
-          margin-top: 0;
+    #videojs-wrapper {
+      display: flex;
+      justify-content: center;
+    }
+
+    .playlist {
+      @include playlist-below-player;
+    }
+  }
+}
+
+@media screen and (max-width: 600px) {
+  .video-bottom {
+    margin: 20px 0 0 0 !important;
+
+    .video-info {
+      padding: 0;
+
+      .video-info-first-row {
+
+        .video-info-name {
+          font-size: 20px;
+          height: auto;
         }
       }
     }
   }
+
+  /deep/ .other-videos .video-miniature  {
+    flex-direction: column;
+  }
+
+  .privacy-concerns {
+    width: 100%;
+
+    strong {
+      display: none;
+    }
+  }
 }
 
-@media screen and (max-width: 800px) {
+@media screen and (max-width: 450px) {
   .video-bottom {
-    margin: 20px 0 0 0;
+    .action-button .icon-text {
+      display: none !important;
+    }
+
+    .video-info .video-info-first-row {
+      .video-info-name {
+        font-size: 18px;
+      }
+
+      .video-info-date-views {
+        font-size: 14px;
+      }
+
+      .video-actions-rates {
+        margin-top: 10px;
+      }
+    }
+
+    .video-info-description {
+      font-size: 14px !important;
+    }
   }
 }