diff options
Diffstat (limited to 'client/src/app/shared/shared-main')
3 files changed, 6 insertions, 4 deletions
diff --git a/client/src/app/shared/shared-main/account/video-avatar-channel.component.scss b/client/src/app/shared/shared-main/account/video-avatar-channel.component.scss index ea7cb2cf7..4998e85fa 100644 --- a/client/src/app/shared/shared-main/account/video-avatar-channel.component.scss +++ b/client/src/app/shared/shared-main/account/video-avatar-channel.component.scss | |||
@@ -26,6 +26,7 @@ | |||
26 | top:50%; | 26 | top:50%; |
27 | left:50%; | 27 | left:50%; |
28 | transform: translate(-50%,-50%); | 28 | transform: translate(-50%,-50%); |
29 | border-radius: 5px; | ||
29 | 30 | ||
30 | &:not(.channel-avatar) { | 31 | &:not(.channel-avatar) { |
31 | border-radius: 50%; | 32 | border-radius: 50%; |
diff --git a/client/src/app/shared/shared-main/misc/simple-search-input.component.scss b/client/src/app/shared/shared-main/misc/simple-search-input.component.scss index 116ff7ea0..5ae48f81b 100644 --- a/client/src/app/shared/shared-main/misc/simple-search-input.component.scss +++ b/client/src/app/shared/shared-main/misc/simple-search-input.component.scss | |||
@@ -16,7 +16,7 @@ my-global-icon { | |||
16 | } | 16 | } |
17 | 17 | ||
18 | &[iconName=search] { | 18 | &[iconName=search] { |
19 | color: pvar(--mainColor); | 19 | color: pvar(--mainForegroundColor); |
20 | } | 20 | } |
21 | 21 | ||
22 | &[iconName=cross] { | 22 | &[iconName=cross] { |
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts index bd187a873..126e43cea 100644 --- a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts +++ b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | import { VideoChannel as ServerVideoChannel, ViewsPerDate, Account, Avatar } from '@shared/models' | 1 | import { Account as ServerAccount, Avatar, VideoChannel as ServerVideoChannel, ViewsPerDate } from '@shared/models' |
2 | import { Account } from '../account/account.model' | ||
2 | import { Actor } from '../account/actor.model' | 3 | import { Actor } from '../account/actor.model' |
3 | 4 | ||
4 | export class VideoChannel extends Actor implements ServerVideoChannel { | 5 | export class VideoChannel extends Actor implements ServerVideoChannel { |
@@ -9,7 +10,7 @@ export class VideoChannel extends Actor implements ServerVideoChannel { | |||
9 | nameWithHost: string | 10 | nameWithHost: string |
10 | nameWithHostForced: string | 11 | nameWithHostForced: string |
11 | 12 | ||
12 | ownerAccount?: Account | 13 | ownerAccount?: ServerAccount |
13 | ownerBy?: string | 14 | ownerBy?: string |
14 | ownerAvatarUrl?: string | 15 | ownerAvatarUrl?: string |
15 | 16 | ||
@@ -46,7 +47,7 @@ export class VideoChannel extends Actor implements ServerVideoChannel { | |||
46 | if (hash.ownerAccount) { | 47 | if (hash.ownerAccount) { |
47 | this.ownerAccount = hash.ownerAccount | 48 | this.ownerAccount = hash.ownerAccount |
48 | this.ownerBy = Actor.CREATE_BY_STRING(hash.ownerAccount.name, hash.ownerAccount.host) | 49 | this.ownerBy = Actor.CREATE_BY_STRING(hash.ownerAccount.name, hash.ownerAccount.host) |
49 | this.ownerAvatarUrl = VideoChannel.GET_ACTOR_AVATAR_URL(this.ownerAccount) | 50 | this.ownerAvatarUrl = Account.GET_ACTOR_AVATAR_URL(this.ownerAccount) |
50 | } | 51 | } |
51 | } | 52 | } |
52 | 53 | ||