From 650e3d5ce380026cc79bcd271915cf7e6f51c24c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 15 Nov 2018 11:54:09 +0100 Subject: Fix miniature with a long name --- client/src/app/shared/video/video-miniature.component.html | 4 ++-- client/src/sass/include/_mixins.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/app/shared/video/video-miniature.component.html b/client/src/app/shared/video/video-miniature.component.html index 277a0cf35..2c635fa2f 100644 --- a/client/src/app/shared/video/video-miniature.component.html +++ b/client/src/app/shared/video/video-miniature.component.html @@ -7,10 +7,10 @@ class="video-miniature-name" [routerLink]="[ '/videos/watch', video.uuid ]" [attr.title]="video.name" [ngClass]="{ 'blur-filter': isVideoBlur }" > - {{ video.name }} - Unlisted Private + + {{ video.name }} {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index b25d7ae0f..d6f391a45 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -29,7 +29,7 @@ display: block; /* Fallback for non-webkit */ display: -webkit-box; - max-height: $font-size*$line-height*$lines-to-show + 0.2; + max-height: $font-size * $line-height * $lines-to-show; /* Fallback for non-webkit */ font-size: $font-size; line-height: $line-height; @@ -511,4 +511,4 @@ } } } -} \ No newline at end of file +} -- cgit v1.2.3