From 1fef6bccd939842408fdd666cc72fed9f2ef6456 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jun 2022 14:06:52 +0200 Subject: Remove secondary color theme --- .../overview/users/user-list/user-list.component.html | 2 +- .../overview/users/user-list/user-list.component.ts | 1 + .../shared/metadata/video-avatar-channel.component.scss | 16 ++++++---------- .../shared/shared-main/users/user-quota.component.html | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) (limited to 'client/src/app') diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html index f6915ae9a..4da46dc7b 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.html +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html @@ -139,7 +139,7 @@
-
{{ user.videoQuotaUsedDaily }} diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts index f7dc22256..c3a7646cc 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts @@ -190,6 +190,7 @@ export class UserListComponent extends RestTable implements OnInit { } getUserVideoQuotaDailyPercentage (user: UserForList) { + console.log(user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily) return user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily } diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss index 80711ff32..fd9dd1a6a 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss @@ -1,14 +1,5 @@ @use '_mixins' as *; -@mixin secondary { - height: 60%; - width: 60%; - position: absolute; - bottom: -5px; - right: -5px; - background-color: rgba(0, 0, 0, 0); -} - .wrapper { @include margin-right(5px); @@ -16,6 +7,11 @@ margin-bottom: 5px; .second-avatar { - @include secondary(); + height: 60%; + width: 60%; + position: absolute; + bottom: -5px; + right: -5px; + background-color: rgba(0, 0, 0, 0); } } diff --git a/client/src/app/shared/shared-main/users/user-quota.component.html b/client/src/app/shared/shared-main/users/user-quota.component.html index dd1fc20d0..0e0d38c2a 100644 --- a/client/src/app/shared/shared-main/users/user-quota.component.html +++ b/client/src/app/shared/shared-main/users/user-quota.component.html @@ -12,7 +12,7 @@
-
{{ userVideoQuotaUsedDaily | bytes: 1 }} {{ userVideoQuotaDaily }} -- cgit v1.2.3