Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-video-miniature / video-miniature.component.scss

diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
index 39d6e97c9de25695612f62c2227f58d7cdc31038..0bbdff1e659500290fc944f31117014013009862 100644 (file)
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
@@ -12,16 +12,8 @@ $more-button-width: 40px;
   width: calc(100% - #{$more-button-width});
 }
 
-.avatar {
+my-actor-avatar {
   margin: 10px 10px 0 0;
-
-  img:not(.channel) {
-    @include avatar(40px);
-  }
-
-  img.channel {
-    @include channel-avatar(40px);
-  }
 }
 
 .video-miniature-created-at-views {
@@ -49,7 +41,7 @@ $more-button-width: 40px;
 }
 
 .video-info-blocked {
-  color: red;
+  color: #ff0000;
 
   .blocked-reason::before {
     content: ' - ';
@@ -57,7 +49,7 @@ $more-button-width: 40px;
 }
 
 .video-info-nsfw {
-  color: red;
+  color: #ff0000;
 }
 
 .video-actions {
@@ -81,9 +73,9 @@ $more-button-width: 40px;
   }
 }
 
-.video-miniature {
-  &:hover ::ng-deep .video-thumbnail-actions-overlay,
-  &:hover .video-actions ::ng-deep .dropdown-root {
+.video-miniature:hover {
+  ::ng-deep .video-thumbnail-actions-overlay,
+  .video-actions ::ng-deep .dropdown-root {
     opacity: 1 !important;
   }
 }
@@ -97,15 +89,15 @@ $more-button-width: 40px;
   width: 100%;
 
   my-video-thumbnail {
-    @include large-screen-ratio($selector: '::ng-deep .video-thumbnail');
+    @include block-ratio($selector: '::ng-deep .video-thumbnail');
   }
 
   .video-bottom {
     display: flex;
     width: 100%;
+    min-width: 1px;
   }
 
-
   .video-miniature-name {
     margin-top: 10px;
     margin-bottom: 5px;
@@ -154,10 +146,11 @@ $more-button-width: 40px;
 
   .video-bottom {
     display: flex;
+    min-width: 1px;
   }
 
   // We don't display avatar in row mode
-  .avatar {
+  .channel-avatar {
     display: none;
   }
 
@@ -169,13 +162,13 @@ $more-button-width: 40px;
   }
 
   .video-miniature-name {
-    @include ellipsis-multiline(1.3em, 2);
+    @include ellipsis-multiline($video-miniature-row-name-font-size, 2);
   }
 
   .video-miniature-created-at-views,
   .video-miniature-account,
   .video-miniature-channel {
-    font-size: 14px;
+    font-size: $video-miniature-row-info-font-size;
   }
 
   .video-actions {
@@ -196,13 +189,13 @@ $more-button-width: 40px;
     --rowThumbnailHeight: #{$video-thumbnail-small-height};
 
     .video-miniature-name {
-      font-size: 14px;
+      font-size: $video-miniature-row-info-font-size;
     }
 
     .video-miniature-created-at-views,
     .video-miniature-account,
     .video-miniature-channel {
-      font-size: 12px;
+      font-size: $video-miniature-row-mobile-info-font-size;
     }
   }
 }