X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=8c23353001c05bae097794866e8391acccaa4396;hb=677119c91404832fb157522c23083b86601b41ab;hp=b03ed197d3fe932318d1c8addf6c12c051f369ef;hpb=28f3d1b36a70426795240c9370e47b6c4ba847f8;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 b03ed197d..8c2335300 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -1,22 +1,64 @@
 @import '_variables';
 @import '_mixins';
 @import '_bootstrap-variables';
+@import '_miniature';
 
-$other-videos-width: 260px;
+$player-factor: 1.7; // 16/9
+$video-info-margin-left: 44px;
 
-.root-row {
-  flex-direction: column;
+@function getPlayerHeight($width){
+  @return calc(#{$width} / #{$player-factor})
+}
+
+@function getPlayerWidth($height){
+  @return calc(#{$height} * #{$player-factor})
+}
+
+@mixin playlist-below-player {
+  width: 100% !important;
+  height: auto !important;
+  max-height: 300px !important;
+  max-width: initial;
+  border-bottom: 1px solid $separator-border-color !important;
+}
+
+.root {
+  &.theater-enabled #video-wrapper {
+    flex-direction: column;
+    justify-content: center;
+
+    #videojs-wrapper {
+      width: 100%;
+    }
+
+    ::ng-deep .video-js {
+      $height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
+
+      height: $height;
+      width: 100%;
+      max-width: initial;
+    }
+
+    my-video-watch-playlist ::ng-deep .playlist {
+      @include playlist-below-player;
+    }
+  }
 }
 
 .blacklisted-label {
   font-weight: $font-semibold;
 }
 
-#video-element-wrapper {
+#video-wrapper {
   background-color: #000;
   display: flex;
   justify-content: center;
-  flex-grow: 1;
+
+  #videojs-wrapper {
+    display: flex;
+    justify-content: center;
+    flex-grow: 1;
+  }
 
   .remote-server-down {
     color: #fff;
@@ -39,14 +81,10 @@ $other-videos-width: 260px;
     }
   }
 
-  /deep/ .video-js {
-    width: 888px;
-    height: 500px;
-
-    &.vjs-theater-enabled {
-      height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
-      width: 100%;
-    }
+  ::ng-deep .video-js {
+    width: 100%;
+    max-width: getPlayerWidth(66vh);
+    height: 66vh;
 
     // VideoJS create an inner video player
     video {
@@ -57,15 +95,20 @@ $other-videos-width: 260px;
 
   @media screen and (max-width: 600px) {
     .remote-server-down,
-    /deep/ .video-js {
+    ::ng-deep .video-js {
       width: 100vw;
-      height: calc(100vw / 1.7); // 16/9
+      height: getPlayerHeight(100vw)
     }
   }
 }
 
 .alert {
   text-align: center;
+  border-radius: 0;
+}
+
+.flex-direction-column {
+  flex-direction: column;
 }
 
 #video-not-found {
@@ -78,6 +121,7 @@ $other-videos-width: 260px;
 }
 
 .video-bottom {
+  display: flex;
   margin-top: 40px;
 
   .video-info {
@@ -101,11 +145,18 @@ $other-videos-width: 260px;
         flex-grow: 1;
       }
 
+      .video-info-first-row-bottom {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        width: 100%;
+      }
+
       .video-info-date-views {
-        flex-grow: 1;
+        align-self: start;
         margin-bottom: 10px;
         margin-right: 10px;
-        font-size: 16px;
+        font-size: 1em;
       }
 
       .video-info-channel {
@@ -124,41 +175,28 @@ $other-videos-width: 260px;
           img {
             @include avatar(18px);
 
-            margin: -2px 2px 0 5px;
+            margin: -2px 5px 0 0;
           }
         }
 
-        my-subscribe-button {
-          margin-left: 5px;
-        }
-      }
-
-      .video-info-by {
-
-        a {
-          @include disable-default-a-behaviour;
-
-          display: inline;
-          align-items: center;
-          font-size: 13px;
-          color: var(--mainForegroundColor);
-
-          span:hover {
-            opacity: 0.8;
-          }
+        .video-info-channel-left {
+          flex-grow: 1;
 
-          img {
-            @include avatar(18px);
+          .video-info-channel-left-links {
+            display: flex;
+            flex-direction: column;
+            position: relative;
+            line-height: 1.37;
 
-            margin-top: -2px;
-            margin-left: 7px;
+            a:nth-of-type(2) {
+              font-weight: 500;
+              font-size: 90%;
+            }
           }
         }
 
-        my-help {
-          position: relative;
-          top: 1px;
-          margin-left: 2px;
+        my-subscribe-button {
+          margin-left: 5px;
         }
       }
 
@@ -168,84 +206,127 @@ $other-videos-width: 260px;
       }
 
       .video-actions-rates {
-        margin: 20px 0 10px 0;
+        margin: 0 0 10px 0;
         align-items: start;
+        width: max-content;
+        margin-left: auto;
 
         .video-actions {
           height: 40px; // Align with the title
           display: flex;
           align-items: center;
 
-          .action-button:not(:first-child), .action-more {
-            margin-left: 10px;
+          .action-button:not(:first-child),
+          .action-dropdown,
+          my-video-actions-dropdown {
+            margin-left: 5px;
           }
 
-          .action-button {
+          ::ng-deep.action-button {
             @include peertube-button;
-            @include grey-button;
             @include button-with-icon(21px, 0, -1px);
-            @include apply-svg-color($grey-foreground-color);
+            @include apply-svg-color(var(--actionButtonColor));
 
-            font-size: 15px;
+            font-size: 100%;
             font-weight: $font-semibold;
             display: inline-block;
             padding: 0 10px 0 10px;
             white-space: nowrap;
+            background-color: transparent !important;
+            color: var(--actionButtonColor);
+            text-transform: uppercase;
 
             &::after {
               display: none;
             }
 
+            &:hover {
+              opacity: 0.9;
+            }
+
+            &.action-button-like,
+            &.action-button-dislike {
+              filter: brightness(120%);
+
+              .count {
+                margin-right: 5px;
+              }
+            }
+
             &.action-button-like.activated {
-              background-color: $green;
+              .count {
+                color: $activated-action-button-color;
+              }
 
               my-global-icon {
-                @include apply-svg-color(#fff);
+                @include apply-svg-color($activated-action-button-color);
               }
             }
 
             &.action-button-dislike.activated {
-              background-color: $red;
+              .count {
+                color: $activated-action-button-color;
+              }
 
               my-global-icon {
-                @include apply-svg-color(#fff);
+                @include apply-svg-color($activated-action-button-color);
               }
             }
 
-            .icon-text {
-              margin-left: 3px;
-            }
-          }
+            &.action-button-support {
+              color: var(--supportButtonColor);
 
-          .action-more {
-            display: inline-block;
-
-            .dropdown-menu .dropdown-item {
-              padding: 6px 24px;
+              my-global-icon {
+                @include apply-svg-color(var(--supportButtonColor));
+              }
+            }
 
+            &.action-button-support {
               my-global-icon {
-                width: 24px;
+                ::ng-deep path:first-child {
+                  fill: var(--supportButtonHeartColor) !important;
+                }
+              }
+            }
 
-                margin-right: 10px;
-                position: relative;
-                top: -2px;
+            &.action-button-save {
+              my-global-icon {
+                top: 0 !important;
+                right: -1px;
               }
             }
+
+            .icon-text {
+              margin-left: 3px;
+            }
           }
         }
 
+        .video-info-likes-dislikes-bar-outer-container {
+          position: relative;
+        }
+
+        .video-info-likes-dislikes-bar-inner-container {
+          position: absolute;
+          height: 20px;
+        }
+
         .video-info-likes-dislikes-bar {
           $likes-bar-height: 2px;
           height: $likes-bar-height;
           margin-top: -$likes-bar-height;
-          width: 186px;
-          background-color: $red;
+          width: 120px;
+          background-color: #ccc;
           position: relative;
           top: 10px;
 
           .likes-bar {
             height: 100%;
-            background-color: $green;
+            background-color: #909090;
+
+            &.liked {
+              background-color: $activated-action-button-color;
+            }
           }
         }
       }
@@ -253,10 +334,15 @@ $other-videos-width: 260px;
 
     .video-info-description {
       margin: 20px 0;
+      margin-left: $video-info-margin-left;
       font-size: 15px;
 
       .video-info-description-html {
         @include peertube-word-wrap;
+
+        /deep/ a {
+          text-decoration: none;
+        }
       }
 
       .glyphicon, .description-loading {
@@ -280,13 +366,17 @@ $other-videos-width: 260px;
       }
     }
 
+    .video-attributes {
+      margin-left: $video-info-margin-left;
+    }
+
     .video-attributes .video-attribute {
       font-size: 13px;
       display: block;
       margin-bottom: 12px;
 
       .video-attribute-label {
-        min-width: 91px;
+        min-width: 142px;
         padding-right: 5px;
         display: inline-block;
         color: $grey-foreground-color;
@@ -312,26 +402,33 @@ $other-videos-width: 260px;
     }
   }
 
-  /deep/ .other-videos {
+  ::ng-deep .other-videos {
     padding-left: 15px;
-    width: $other-videos-width;
+    min-width: $video-miniature-width;
+
+    @media screen and (min-width: 1800px - (3* $video-miniature-width)) {
+      width: min-content;
+    }
 
     .title-page {
-      margin-top: 0 !important;
+      margin: 0 !important;
     }
 
     .video-miniature {
       display: flex;
+      width: max-content;
       height: 100%;
       margin-bottom: 20px;
       flex-wrap: wrap;
+    }
 
-      .video-miniature-information {
-        flex-grow: 1;
+    .video-bottom {
+      @media screen and (max-width: 1800px - (3* $video-miniature-width)) {
+        margin-left: 1rem;
       }
-
-      .video-thumbnail {
-        margin-right: 10px
+      @media screen and (max-width: 500px) {
+        margin-left: 0;
+        margin-top: .5rem;
       }
     }
   }
@@ -345,29 +442,32 @@ my-video-comments {
 
 // If the view is not expanded, take into account the menu
 .privacy-concerns {
+  z-index: z(dropdown) + 1;
   width: calc(100% - #{$menu-width});
 }
 
 @media screen and (max-width: $small-view) {
   .privacy-concerns {
-    margin-left: $menu-width;
+    margin-left: $menu-width - 15px; // Menu is absolute
   }
 }
 
 :host-context(.expanded) {
   .privacy-concerns {
     width: 100%;
-    margin-left: 0;
+    margin-left: -15px;
   }
 }
 
 .privacy-concerns {
   position: fixed;
   bottom: 0;
+  z-index: z(privacymsg);
 
   padding: 5px 15px;
 
   display: flex;
+  flex-wrap: nowrap;
   align-items: center;
   justify-content: flex-start;
   background-color: rgba(0, 0, 0, 0.9);
@@ -388,11 +488,11 @@ my-video-comments {
     }
   }
 
-  .privacy-concerns-okay {
-    background-color: var(--mainColor);
+  .privacy-concerns-button {
     padding: 5px 8px 5px 7px;
     margin-left: auto;
     border-radius: 3px;
+    white-space: nowrap;
     cursor: pointer;
     transition: background-color 0.3s;
     font-weight: $font-semibold;
@@ -401,11 +501,10 @@ my-video-comments {
       background-color: #000;
     }
   }
-}
 
-@media screen and (min-width: map-get($grid-breakpoints, xl)) {
-  .video-bottom .video-info {
-    max-width: calc(100% - #{$other-videos-width});
+  .privacy-concerns-okay {
+    background-color: var(--mainColor);
+    margin-left: 10px;
   }
 }
 
@@ -426,9 +525,33 @@ my-video-comments {
   }
 }
 
+@media screen and (max-width: 1100px) {
+  #video-wrapper {
+    flex-direction: column;
+    justify-content: center;
+
+    my-video-watch-playlist ::ng-deep .playlist {
+      @include playlist-below-player;
+    }
+  }
+
+  .video-bottom {
+    flex-direction: column;
+
+    ::ng-deep .other-videos {
+      padding-left: 0 !important;
+
+      ::ng-deep .video-miniature  {
+        flex-direction: row;
+        width: auto;
+      }
+    }
+  }
+}
+
 @media screen and (max-width: 600px) {
   .video-bottom {
-    margin: 20px 0 0 0;
+    margin: 20px 0 0 0 !important;
 
     .video-info {
       padding: 0;
@@ -443,12 +566,8 @@ my-video-comments {
     }
   }
 
-  /deep/ .other-videos {
-    padding-left: 0 !important;
-
-    /deep/ .video-miniature  {
-      flex-direction: column;
-    }
+  ::ng-deep .other-videos .video-miniature  {
+    flex-direction: column;
   }
 
   .privacy-concerns {