Fix infinite scroll on big screens

[github/Chocobozzz/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 11406e88702c61ee765ce139d451442677dacccd..9c3f53b3db19fbf6281b7d65a832d984fabc176c 100644 (file)
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -15,13 +15,14 @@ $player-factor: 1.7; // 16/9
 }
 
 @mixin playlist-below-player {
-  width: 100%;
-  border-bottom: 1px solid $separator-border-color;
+  width: 100% !important;
+  height: auto !important;
+  max-height: 300px !important;
+  max-width: initial;
+  border-bottom: 1px solid $separator-border-color !important;
 }
 
 .root {
-  margin: 0 -15px;
-
   &.theater-enabled #video-wrapper {
     flex-direction: column;
     justify-content: center;
@@ -30,14 +31,14 @@ $player-factor: 1.7; // 16/9
       width: 100%;
     }
 
-    /deep/ .video-js {
+    ::ng-deep .video-js {
       $height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
 
       height: $height;
       width: 100%;
     }
 
-    .playlist {
+    my-video-watch-playlist ::ng-deep .playlist {
       @include playlist-below-player;
     }
   }
@@ -51,6 +52,13 @@ $player-factor: 1.7; // 16/9
   background-color: #000;
   display: flex;
   justify-content: center;
+  margin: 0 -15px;
+
+  #videojs-wrapper {
+    display: flex;
+    justify-content: center;
+    flex-grow: 1;
+  }
 
   .remote-server-down {
     color: #fff;
@@ -73,60 +81,9 @@ $player-factor: 1.7; // 16/9
     }
   }
 
-  .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);
+  ::ng-deep .video-js {
+    width: 100%;
+    max-width: getPlayerWidth(66vh);
     height: 66vh;
 
     // VideoJS create an inner video player
@@ -138,7 +95,7 @@ $player-factor: 1.7; // 16/9
 
   @media screen and (max-width: 600px) {
     .remote-server-down,
-    /deep/ .video-js {
+    ::ng-deep .video-js {
       width: 100vw;
       height: getPlayerHeight(100vw)
     }
@@ -147,6 +104,7 @@ $player-factor: 1.7; // 16/9
 
 .alert {
   text-align: center;
+  border-radius: 0;
 }
 
 #video-not-found {
@@ -258,7 +216,9 @@ $player-factor: 1.7; // 16/9
           display: flex;
           align-items: center;
 
-          .action-button:not(:first-child), .action-dropdown {
+          .action-button:not(:first-child),
+          .action-dropdown,
+          my-video-actions-dropdown {
             margin-left: 10px;
           }
 
@@ -305,14 +265,6 @@ $player-factor: 1.7; // 16/9
               margin-left: 3px;
             }
           }
-
-          .action-dropdown {
-            display: inline-block;
-
-            .dropdown-menu .dropdown-item {
-              @include dropdown-with-icon-item;
-            }
-          }
         }
 
         .video-info-likes-dislikes-bar {
@@ -393,9 +345,10 @@ $player-factor: 1.7; // 16/9
     }
   }
 
-  /deep/ .other-videos {
+  ::ng-deep .other-videos {
     padding-left: 15px;
     flex-basis: $other-videos-width;
+    min-width: $other-videos-width;
 
     .title-page {
       margin-top: 0 !important;
@@ -428,14 +381,14 @@ my-video-comments {
 
 @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;
   }
 }
 
@@ -446,6 +399,7 @@ my-video-comments {
   padding: 5px 15px;
 
   display: flex;
+  flex-wrap: nowrap;
   align-items: center;
   justify-content: flex-start;
   background-color: rgba(0, 0, 0, 0.9);
@@ -499,39 +453,32 @@ my-video-comments {
 }
 
 @media screen and (max-width: 1100px) {
-  .video-bottom {
+  #video-wrapper {
     flex-direction: column;
+    justify-content: center;
 
-    /deep/ .other-videos {
-      padding-left: 0 !important;
-
-      /deep/ .video-miniature  {
-        flex-direction: row;
-        width: auto;
-      }
+    my-video-watch-playlist ::ng-deep .playlist {
+      @include playlist-below-player;
     }
   }
-}
 
-@media screen and (max-width: 900px) {
-  #video-wrapper {
+  .video-bottom {
     flex-direction: column;
-    justify-content: center;
 
-    #videojs-wrapper {
-      display: flex;
-      justify-content: center;
-    }
+    ::ng-deep .other-videos {
+      padding-left: 0 !important;
 
-    .playlist {
-      @include playlist-below-player;
+      ::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;
@@ -546,7 +493,7 @@ my-video-comments {
     }
   }
 
-  /deep/ .other-videos .video-miniature  {
+  ::ng-deep .other-videos .video-miniature  {
     flex-direction: column;
   }