4 files changed, 98 insertions, 144 deletions

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index c35574568..4964ec85e 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -58,6 +58,7 @@ body {
   --activatedActionButtonColor: #{$activated-action-button-color};
 
   --horizontalMarginContent: #{$not-expanded-horizontal-margins};
+  --videosHorizontalMarginContent: 6vw;
   --mainColWidth: calc(100vw - #{$menu-width});
 
   font-family: $main-fonts;
@@ -332,8 +333,16 @@ ngx-loading-bar {
 }
 
 @media screen and (max-width: #{breakpoint(xxl)}) {
-  .main-col.expanded {
-    --horizontalMarginContent: #{$expanded-horizontal-margins/2};
+  .main-col {
+    & {
+      --horizontalMarginContent: #{$not-expanded-horizontal-margins / 2};
+    }
+
+    &.expanded {
+      --horizontalMarginContent: #{$expanded-horizontal-margins / 2};
+    }
+
+    --videosHorizontalMarginContent: #{pvar(--horizontalMarginContent)};
   }
 }
 
@@ -341,7 +350,7 @@ ngx-loading-bar {
   /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */
   .main-col,
   .main-col.expanded {
-    --horizontalMarginContent: #{$expanded-horizontal-margins/3};
+    --horizontalMarginContent: #{$expanded-horizontal-margins / 3};
 
     .sub-menu {
       padding-left: 50px;
diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss
index 7643a6816..9e1fc63e3 100644
--- a/client/src/sass/include/_miniature.scss
+++ b/client/src/sass/include/_miniature.scss
@@ -5,11 +5,10 @@
   @include ellipsis-multiline(1.1em, 2);
 
   word-break: break-all;
+  word-wrap: break-word;
   transition: color 0.2s;
   font-weight: $font-semibold;
   color: pvar(--mainForegroundColor);
-  margin-top: 10px;
-  margin-bottom: 5px;
 
   &:hover {
     text-decoration: none;
@@ -21,20 +20,20 @@
   }
 }
 
-$play-overlay-transition: 0.2s ease;
-$play-overlay-height: 26px;
-$play-overlay-width: 18px;
-
 @mixin miniature-thumbnail {
   @include disable-outline;
 
+  $play-overlay-transition: 0.2s ease;
+  $play-overlay-height: 26px;
+  $play-overlay-width: 18px;
+
   display: flex;
   flex-direction: column;
   position: relative;
   border-radius: 3px;
+  width: 100%;
+  height: 100%;
   overflow: hidden;
-  width: $video-thumbnail-width;
-  height: $video-thumbnail-height;
   background-color: #ececec;
   transition: filter $play-overlay-transition;
 
@@ -98,140 +97,36 @@ $play-overlay-width: 18px;
   color: #fff;
 }
 
-@mixin miniature-rows {
-  &:first-child {
-    padding-top: 30px;
-
-    .section-title {
-      border-top: none !important;
-    }
-  }
-
-  .section-title {
-    font-size: 24px;
-    font-weight: $font-semibold;
-    padding-top: 15px;
-    margin-bottom: 15px;
-    display: flex;
-    justify-content: space-between;
-
-    &:not(h2) {
-      border-top: 1px solid $separator-border-color;
-    }
-
-    a {
-      &:hover, &:focus:not(.focus-visible), &:active {
-        text-decoration: none;
-        outline: none;
-      }
-
-      color: pvar(--mainForegroundColor);
-    }
-  }
-
-  &.channel {
-    .section-title {
-      a {
-        display: flex;
-        width: fit-content;
-        align-items: center;
-
-        img {
-          @include channel-avatar(28px);
-
-          margin-right: 8px;
-        }
-      }
-
-      .followers {
-        color: pvar(--greyForegroundColor);
-        font-weight: normal;
-        font-size: 14px;
-        margin-left: 10px;
-        position: relative;
-        top: 2px;
-      }
-    }
-  }
-
-  .show-more {
-    position: relative;
-    top: -5px;
-    display: inline-block;
-    font-size: 16px;
-    text-transform: uppercase;
-    color: pvar(--greyForegroundColor);
-    margin-bottom: 10px;
-    font-weight: $font-semibold;
-    text-decoration: none;
-  }
-
-  @media screen and (max-width: $mobile-view) {
-    max-height: initial;
-    overflow: initial;
-
-    .section-title {
-      font-size: 17px;
-      margin-left: 10px;
-    }
-  }
-}
-
 // Use margin by default, or padding if $margin is false
-@mixin fluid-videos-miniature-margins ($margin: true, $min-margin: 0) {
-  --fluidVideosMiniatureMargins: #{pvar(--horizontalMarginContent)};
+@mixin grid-videos-miniature-margins ($margin: true, $min-margin: 0) {
+  --gridVideosMiniatureMargins: #{pvar(--videosHorizontalMarginContent)};
 
   @if $margin {
-    margin-left: var(--fluidVideosMiniatureMargins) !important;
-    margin-right: var(--fluidVideosMiniatureMargins) !important;
+    margin-left: var(--gridVideosMiniatureMargins) !important;
+    margin-right: var(--gridVideosMiniatureMargins) !important;
   } @else {
-    padding-left: var(--fluidVideosMiniatureMargins) !important;
-    padding-right: var(--fluidVideosMiniatureMargins) !important;
+    padding-left: var(--gridVideosMiniatureMargins) !important;
+    padding-right: var(--gridVideosMiniatureMargins) !important;
   }
 
   @media screen and (max-width: $mobile-view) {
-    --fluidVideosMiniatureMargins: $min-margin;
+    --gridVideosMiniatureMargins: #{$min-margin};
 
     width: auto;
   }
 }
 
-@mixin fluid-videos-miniature-layout {
-  @include fluid-videos-miniature-margins;
-
-  @media screen and (max-width: $mobile-view) {
-    .videos {
-      text-align: center;
-
-      ::ng-deep .video-miniature {
-        padding-right: 0;
-        height: auto;
-        width: 100%;
-        margin-bottom: 25px;
-
-        .video-miniature-information {
-          width: 100% !important;
-          text-align: left;
-
-          span {
-            width: 100%;
-          }
-        }
-
-        .video-thumbnail {
-          border-radius: 0;
-        }
-      }
-    }
-  }
+@mixin grid-videos-miniature-layout {
+  @include grid-videos-miniature-margins;
 
   @media screen and (min-width: $mobile-view) {
-    .videos {
-      --miniatureMinWidth: #{$video-thumbnail-width - 15px};
+    .videos,
+    .playlists {
+      --miniatureMinWidth: #{$video-thumbnail-width - 25px};
       --miniatureMaxWidth: #{$video-thumbnail-width};
 
       display: grid;
-      column-gap: 5px;
+      column-gap: 30px;
       grid-template-columns: repeat(
         auto-fill,
         minmax(
@@ -240,21 +135,33 @@ $play-overlay-width: 18px;
         )
       );
 
-      @media screen and (min-width: #{breakpoint(fhd)}) {
-        column-gap: 1%;
-        --miniatureMinWidth: #{$video-thumbnail-width};
-      }
-
-      .video-wrapper {
+      .video-wrapper,
+      .playlist-wrapper {
         margin: 0 auto;
         width: 100%;
 
-        my-video-miniature {
+        my-video-miniature,
+        my-video-playlist-miniature {
           display: block;
           min-width: var(--miniatureMinWidth);
           max-width: var(--miniatureMaxWidth);
         }
       }
+
+      @media screen and (min-width: #{breakpoint(xm)}) {
+        column-gap: 15px;
+      }
+
+      @media screen and (min-width: #{breakpoint(fhd)}) {
+        column-gap: 2%;
+      }
+    }
+  }
+
+  @media screen and (max-width: $mobile-view) {
+    .videos,
+    .playlists {
+      text-align: center;
     }
   }
 }
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index eac2f1a7f..e37b89c62 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -620,17 +620,23 @@
   @include button-with-icon(20px, 5px, -1px);
 }
 
-@mixin row-blocks {
+@mixin row-blocks ($column-responsive: true) {
   display: flex;
   min-height: 130px;
   padding-bottom: 20px;
   margin-bottom: 20px;
   border-bottom: 1px solid #C6C6C6;
 
-  @media screen and (max-width: 800px) {
-    flex-direction: column;
-    height: auto;
-    align-items: center;
+  @media screen and (max-width: $small-view) {
+    @if $column-responsive {
+      flex-direction: column;
+      height: auto;
+      align-items: center;
+    } @else {
+      min-height: initial;
+      padding-bottom: 10px;
+      margin-bottom: 10px;
+    }
   }
 }
 
@@ -932,3 +938,31 @@
 
   border-left: $width solid rgba(255, 255, 255, 0.95);
 }
+
+@mixin on-small-main-col () {
+  :host-context(.main-col:not(.expanded)) {
+    @media screen and (max-width: $small-view + $menu-width) {
+      @content;
+    }
+  }
+
+  :host-context(.main-col.expanded) {
+    @media screen and (max-width: $small-view) {
+      @content;
+    }
+  }
+}
+
+@mixin on-mobile-main-col () {
+  :host-context(.main-col:not(.expanded)) {
+    @media screen and (max-width: $mobile-view + $menu-width) {
+      @content;
+    }
+  }
+
+  :host-context(.main-col.expanded) {
+    @media screen and (max-width: $mobile-view) {
+      @content;
+    }
+  }
+}
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 8c5e75864..4c9a79621 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -34,7 +34,7 @@ $green: #39CC0B;
 $grey-actor-name: #777272;
 
 $expanded-horizontal-margins: 150px;
-$not-expanded-horizontal-margins: 60px;
+$not-expanded-horizontal-margins: 30px;
 
 $button-height: 30px;
 
@@ -59,10 +59,13 @@ $footer-margin: 30px;
 
 $separator-border-color: rgba(0, 0, 0, 0.10);
 
-$video-miniature-width: 238px;
 $video-miniature-margin-bottom: 15px;
-$video-thumbnail-height: 122px;
-$video-thumbnail-width: 223px;
+$video-thumbnail-height: 153px;
+$video-thumbnail-width: 280px;
+$video-thumbnail-medium-height: 114px;
+$video-thumbnail-medium-width: 201px;
+$video-thumbnail-small-height: 71px;
+$video-thumbnail-small-width: 125px;
 
 $theater-bottom-space: 115px;
 
@@ -125,6 +128,7 @@ $variables: (
   --embedBigPlayBackgroundColor: var(--embedBigPlayBackgroundColor),
 
   --horizontalMarginContent: var(--horizontalMarginContent),
+  --videosHorizontalMarginContent: var(--videosHorizontalMarginContent),
   --mainColWidth: var(--mainColWidth)
 );