Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix broken video thumbnail

Chocobozzz4e94c7477cb7
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
index 8842b5403b..c53dba9e60 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
@@ -1,7 +1,7 @@
-@use 'sass:math';
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_miniature' as *;
+@use "sass:math";
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "_miniature" as *;
.margin-content {
@include grid-videos-miniature-margins;
@@ -77,12 +77,13 @@ my-subscribe-button {
position: relative;
my-video-miniature {
+ --thumbnail-width: #{$video-thumbnail-medium-width}; // Required by video-thumbnail component
+
min-width: $video-thumbnail-medium-width;
max-width: $video-thumbnail-medium-width;
@include margin-right(15px);
}
-
}
.videos-overflow-workaround {
diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
index 6de0ab725e..f1606e452c 100644
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
@@ -113,14 +113,16 @@ export class VideoThumbnailComponent implements OnChanges {
if (!width) {
const cssVariable = computedStyle.getPropertyValue('--thumbnail-width')
- const widthStr = cssVariable.replace('px', '').trim()
+ const widthStr = cssVariable === '100%'
+ ? window.innerWidth
+ : cssVariable.replace('px', '').trim()
if (!widthStr) {
logger.error('Cannot find thumbnail width in CSS variables. Fallback to 280px')
- return ''
+ width = 280
+ } else {
+ width = +widthStr
}
-
- width = +widthStr
}
return findAppropriateThumbnailFileUrl(video.thumbnails, width, '16:9')
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 db4ff9cf92..ee4a019f07 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
@@ -96,8 +96,6 @@ my-actor-host {
// Grid mode inherited from parent component
// Takes all the width on mobile
.video-miniature:not(.display-as-row) {
- --thumbnail-width: var(--co-miniature-max-width); // Required by video-thumbnail component
-
display: flex;
flex-direction: column;
padding-bottom: 1rem;
@@ -108,6 +106,8 @@ my-actor-host {
}
my-video-thumbnail {
+ --thumbnail-width: 100%; // Required by video-thumbnail component
+
margin-bottom: 0.35rem;
@include block-ratio($selector: "::ng-deep .video-thumbnail");
diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss
index 0e15b83c27..6c14bc099b 100644
--- a/client/src/sass/include/_miniature.scss
+++ b/client/src/sass/include/_miniature.scss
@@ -126,6 +126,7 @@
.playlists {
--co-miniature-min-width: #{$video-thumbnail-width - 25px};
--co-miniature-max-width: #{$video-thumbnail-width};
+ --thumbnail-width: var(--co-miniature-max-width); // Required by video-thumbnail component
display: grid;
column-gap: 30px;