aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-10-27 08:45:30 +0100
committerChocobozzz <chocobozzz@cpy.re>2020-11-09 15:33:04 +0100
commitda0310f821b039fea1fcbf8aea49e1d2279ba98e (patch)
tree0a3226c045df53f280a7d55250c2c0c108164899
parentb5b687550d8ef8beafdf706e45d6556fb5f4c876 (diff)
downloadPeerTube-da0310f821b039fea1fcbf8aea49e1d2279ba98e.tar.gz
PeerTube-da0310f821b039fea1fcbf8aea49e1d2279ba98e.tar.zst
PeerTube-da0310f821b039fea1fcbf8aea49e1d2279ba98e.zip
Add thumbnail info if live
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.html2
-rw-r--r--client/src/app/shared/shared-thumbnail/video-thumbnail.component.html3
-rw-r--r--client/src/app/shared/shared-thumbnail/video-thumbnail.component.scss12
3 files changed, 13 insertions, 4 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index bc1c302de..74c82fbfd 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -268,7 +268,7 @@
268 >{{ tag }}</a> 268 >{{ tag }}</a>
269 </div> 269 </div>
270 270
271 <div class="video-attribute"> 271 <div class="video-attribute" *ngIf="!video.isLive">
272 <span i18n class="video-attribute-label">Duration</span> 272 <span i18n class="video-attribute-label">Duration</span>
273 <span class="video-attribute-value">{{ video.duration | myDurationFormatter }}</span> 273 <span class="video-attribute-value">{{ video.duration | myDurationFormatter }}</span>
274 </div> 274 </div>
diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html
index 0cb0f321b..be07844ab 100644
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html
@@ -26,7 +26,8 @@
26 <div class="video-thumbnail-label-overlay warning"><ng-content select="label-warning"></ng-content></div> 26 <div class="video-thumbnail-label-overlay warning"><ng-content select="label-warning"></ng-content></div>
27 <div class="video-thumbnail-label-overlay danger"><ng-content select="label-danger"></ng-content></div> 27 <div class="video-thumbnail-label-overlay danger"><ng-content select="label-danger"></ng-content></div>
28 28
29 <div class="video-thumbnail-duration-overlay">{{ video.durationLabel }}</div> 29 <div class="video-thumbnail-duration-overlay" *ngIf="!video.isLive">{{ video.durationLabel }}</div>
30 <div i18n class="video-thumbnail-live-overlay" *ngIf="video.isLive">LIVE</div>
30 31
31 <div class="play-overlay"> 32 <div class="play-overlay">
32 <div class="icon"></div> 33 <div class="icon"></div>
diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.scss b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.scss
index feff78a87..1b6151c89 100644
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.scss
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.scss
@@ -20,7 +20,8 @@
20 20
21 .video-thumbnail-watch-later-overlay, 21 .video-thumbnail-watch-later-overlay,
22 .video-thumbnail-label-overlay, 22 .video-thumbnail-label-overlay,
23 .video-thumbnail-duration-overlay { 23 .video-thumbnail-duration-overlay,
24 .video-thumbnail-live-overlay {
24 @include static-thumbnail-overlay; 25 @include static-thumbnail-overlay;
25 26
26 border-radius: 3px; 27 border-radius: 3px;
@@ -41,13 +42,20 @@
41 &.danger { background-color: red; } 42 &.danger { background-color: red; }
42 } 43 }
43 44
44 .video-thumbnail-duration-overlay { 45 .video-thumbnail-duration-overlay,
46 .video-thumbnail-live-overlay {
45 position: absolute; 47 position: absolute;
46 padding: 0 3px; 48 padding: 0 3px;
47 right: 5px; 49 right: 5px;
48 bottom: 5px; 50 bottom: 5px;
49 } 51 }
50 52
53 .video-thumbnail-live-overlay {
54 background-color: rgba(224, 8, 8, 0.7);
55 color: #fff;
56 font-weight: $font-semibold;
57 }
58
51 .video-thumbnail-actions-overlay { 59 .video-thumbnail-actions-overlay {
52 position: absolute; 60 position: absolute;
53 display: flex; 61 display: flex;