diff options
Diffstat (limited to 'client/src/app')
5 files changed, 16 insertions, 6 deletions
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 @@ | |||
12 | </span> | 12 | </span> |
13 | 13 | ||
14 | <span class="video-miniature-created-at-views">{{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views</span> | 14 | <span class="video-miniature-created-at-views">{{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views</span> |
15 | <span class="video-miniature-account">{{ video.by }}</span> | 15 | <a class="video-miniature-account" [routerLink]="[ '/account', video.account.id ]">{{ video.by }}</a> |
16 | </div> | 16 | </div> |
17 | </div> | 17 | </div> |
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 @@ | |||
39 | } | 39 | } |
40 | 40 | ||
41 | .video-miniature-account { | 41 | .video-miniature-account { |
42 | @include disable-default-a-behaviour; | ||
43 | |||
42 | display: block; | 44 | display: block; |
43 | overflow: hidden; | 45 | overflow: hidden; |
44 | text-overflow: ellipsis; | 46 | text-overflow: ellipsis; |
45 | white-space: nowrap; | 47 | white-space: nowrap; |
46 | font-size: 13px; | 48 | font-size: 13px; |
47 | color: #585858; | 49 | color: #585858; |
50 | |||
51 | &:hover { | ||
52 | color: #303030; | ||
53 | } | ||
48 | } | 54 | } |
49 | } | 55 | } |
50 | } | 56 | } |
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 { | |||
35 | nsfw: boolean | 35 | nsfw: boolean |
36 | 36 | ||
37 | account: { | 37 | account: { |
38 | id: number | ||
39 | uuid: string | ||
38 | name: string | 40 | name: string |
39 | displayName: string | 41 | displayName: string |
40 | url: string | 42 | 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 @@ | |||
23 | 23 | ||
24 | <div class="video-info-by"> | 24 | <div class="video-info-by"> |
25 | <a [routerLink]="[ '/account', video.account.id ]" title="Go the account page"> | 25 | <a [routerLink]="[ '/account', video.account.id ]" title="Go the account page"> |
26 | By {{ video.by }} | 26 | <span>By {{ video.by }}</span> |
27 | <img [src]="getAvatarPath()" alt="Account avatar" /> | 27 | <img [src]="getAvatarPath()" alt="Account avatar" /> |
28 | </a> | 28 | </a> |
29 | </div> | 29 | </div> |
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 @@ | |||
68 | font-size: 15px; | 68 | font-size: 15px; |
69 | } | 69 | } |
70 | 70 | ||
71 | .video-info-by { | 71 | .video-info-by a { |
72 | @include disable-default-a-behaviour; | ||
73 | |||
72 | display: flex; | 74 | display: flex; |
73 | align-items: center; | 75 | align-items: center; |
74 | font-size: 13px; | 76 | font-size: 13px; |
77 | color: #000; | ||
75 | 78 | ||
76 | a { | 79 | span:hover { |
77 | color: black; | 80 | opacity: 0.8; |
78 | display: inline-block; | ||
79 | } | 81 | } |
80 | 82 | ||
81 | img { | 83 | img { |