From 03e12d7c4954e1071fdeb7ef362ea5c3965d4075 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 25 Apr 2018 14:32:19 +0200 Subject: Add account link in videos list --- client/src/app/shared/video/video-miniature.component.html | 2 +- client/src/app/shared/video/video-miniature.component.scss | 6 ++++++ client/src/app/shared/video/video.model.ts | 2 ++ client/src/app/videos/+video-watch/video-watch.component.html | 2 +- client/src/app/videos/+video-watch/video-watch.component.scss | 10 ++++++---- 5 files changed, 16 insertions(+), 6 deletions(-) (limited to 'client') diff --git a/client/src/app/shared/video/video-miniature.component.html b/client/src/app/shared/video/video-miniature.component.html index 233432142..d0b305509 100644 --- a/client/src/app/shared/video/video-miniature.component.html +++ b/client/src/app/shared/video/video-miniature.component.html @@ -12,6 +12,6 @@ {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views - {{ video.by }} + {{ video.by }} diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss index ece090828..588eea3a7 100644 --- a/client/src/app/shared/video/video-miniature.component.scss +++ b/client/src/app/shared/video/video-miniature.component.scss @@ -39,12 +39,18 @@ } .video-miniature-account { + @include disable-default-a-behaviour; + display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 13px; color: #585858; + + &:hover { + color: #303030; + } } } } diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index a284c1688..2e85f40ef 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts @@ -35,6 +35,8 @@ export class Video implements VideoServerModel { nsfw: boolean account: { + id: number + uuid: string name: string displayName: string url: string 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 abda5043e..036d75d3c 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html @@ -23,7 +23,7 @@
- By {{ video.by }} + By {{ video.by }} Account avatar
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index 1b44f0d6a..b4d9841fe 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -68,14 +68,16 @@ font-size: 15px; } - .video-info-by { + .video-info-by a { + @include disable-default-a-behaviour; + display: flex; align-items: center; font-size: 13px; + color: #000; - a { - color: black; - display: inline-block; + span:hover { + opacity: 0.8; } img { -- cgit v1.2.3