diff options
8 files changed, 9 insertions, 34 deletions
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 @@ | |||
139 | 139 | ||
140 | <td *ngIf="isSelected('quotaDaily')"> | 140 | <td *ngIf="isSelected('quotaDaily')"> |
141 | <div class="progress" i18n-title title="Total daily video quota"> | 141 | <div class="progress" i18n-title title="Total daily video quota"> |
142 | <div class="progress-bar secondary" role="progressbar" [style]="{ width: getUserVideoQuotaDailyPercentage(user) + '%' }" | 142 | <div class="progress-bar" role="progressbar" [style]="{ width: getUserVideoQuotaDailyPercentage(user) + '%' }" |
143 | [attr.aria-valuenow]="user.rawVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.rawVideoQuotaDaily"> | 143 | [attr.aria-valuenow]="user.rawVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.rawVideoQuotaDaily"> |
144 | </div> | 144 | </div> |
145 | <span>{{ user.videoQuotaUsedDaily }}</span> | 145 | <span>{{ user.videoQuotaUsedDaily }}</span> |
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 { | |||
190 | } | 190 | } |
191 | 191 | ||
192 | getUserVideoQuotaDailyPercentage (user: UserForList) { | 192 | getUserVideoQuotaDailyPercentage (user: UserForList) { |
193 | console.log(user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily) | ||
193 | return user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily | 194 | return user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily |
194 | } | 195 | } |
195 | 196 | ||
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 @@ | |||
1 | @use '_mixins' as *; | 1 | @use '_mixins' as *; |
2 | 2 | ||
3 | @mixin secondary { | ||
4 | height: 60%; | ||
5 | width: 60%; | ||
6 | position: absolute; | ||
7 | bottom: -5px; | ||
8 | right: -5px; | ||
9 | background-color: rgba(0, 0, 0, 0); | ||
10 | } | ||
11 | |||
12 | .wrapper { | 3 | .wrapper { |
13 | @include margin-right(5px); | 4 | @include margin-right(5px); |
14 | 5 | ||
@@ -16,6 +7,11 @@ | |||
16 | margin-bottom: 5px; | 7 | margin-bottom: 5px; |
17 | 8 | ||
18 | .second-avatar { | 9 | .second-avatar { |
19 | @include secondary(); | 10 | height: 60%; |
11 | width: 60%; | ||
12 | position: absolute; | ||
13 | bottom: -5px; | ||
14 | right: -5px; | ||
15 | background-color: rgba(0, 0, 0, 0); | ||
20 | } | 16 | } |
21 | } | 17 | } |
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 @@ | |||
12 | <div *ngIf="hasDailyQuota()" class="mt-3"> | 12 | <div *ngIf="hasDailyQuota()" class="mt-3"> |
13 | <label class="user-quota-title" tabindex="0" i18n>Daily video quota</label> | 13 | <label class="user-quota-title" tabindex="0" i18n>Daily video quota</label> |
14 | <div class="progress" tabindex="0" [ngbTooltip]="titleVideoQuotaDaily()"> | 14 | <div class="progress" tabindex="0" [ngbTooltip]="titleVideoQuotaDaily()"> |
15 | <div class="progress-bar secondary" role="progressbar" [style]="{ width: userVideoQuotaDailyPercentage + '%' }" | 15 | <div class="progress-bar" role="progressbar" [style]="{ width: userVideoQuotaDailyPercentage + '%' }" |
16 | [attr.aria-valuenow]="userVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.videoQuotaDaily"></div> | 16 | [attr.aria-valuenow]="userVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.videoQuotaDaily"></div> |
17 | <span>{{ userVideoQuotaUsedDaily | bytes: 1 }}</span> | 17 | <span>{{ userVideoQuotaUsedDaily | bytes: 1 }}</span> |
18 | <span>{{ userVideoQuotaDaily }}</span> | 18 | <span>{{ userVideoQuotaDaily }}</span> |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index b5b05a3c4..44c0d13ff 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -37,8 +37,6 @@ body { | |||
37 | --mainBackgroundColor: #{$bg-color}; | 37 | --mainBackgroundColor: #{$bg-color}; |
38 | --mainForegroundColor: #{$fg-color}; | 38 | --mainForegroundColor: #{$fg-color}; |
39 | 39 | ||
40 | --secondaryColor: #{$secondary-color}; | ||
41 | |||
42 | --greyForegroundColor: #{$grey-foreground-color}; | 40 | --greyForegroundColor: #{$grey-foreground-color}; |
43 | --greyBackgroundColor: #{$grey-background-color}; | 41 | --greyBackgroundColor: #{$grey-background-color}; |
44 | --greySecondaryBackgroundColor: #{$grey-background-hover-color}; | 42 | --greySecondaryBackgroundColor: #{$grey-background-hover-color}; |
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 2df2d0680..b4a6b8679 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -264,18 +264,6 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
264 | } | 264 | } |
265 | } | 265 | } |
266 | 266 | ||
267 | .btn-outline-tertiary { | ||
268 | color: pvar(--secondaryColor); | ||
269 | border-color: pvar(--secondaryColor); | ||
270 | |||
271 | &:focus-within, | ||
272 | &:focus, | ||
273 | &:hover { | ||
274 | color: pvar(--mainBackgroundColor); | ||
275 | background-color: pvar(--secondaryColor); | ||
276 | } | ||
277 | } | ||
278 | |||
279 | .btn-group.select-button { | 267 | .btn-group.select-button { |
280 | font-weight: $font-semibold; | 268 | font-weight: $font-semibold; |
281 | 269 | ||
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 26f5a149a..e18173130 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -678,10 +678,6 @@ | |||
678 | white-space: nowrap; | 678 | white-space: nowrap; |
679 | transition: width 0.6s ease; | 679 | transition: width 0.6s ease; |
680 | 680 | ||
681 | &.secondary { | ||
682 | background-color: pvar(--secondaryColor); | ||
683 | } | ||
684 | |||
685 | &.red { | 681 | &.red { |
686 | background-color: lighten($color: #c54130, $amount: 10); | 682 | background-color: lighten($color: #c54130, $amount: 10); |
687 | } | 683 | } |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 884e7b5d0..776e820be 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -23,8 +23,6 @@ $main-color-lightest: lighten($main-color, 40%); | |||
23 | $main-hover-color: lighten($main-color, 5%); | 23 | $main-hover-color: lighten($main-color, 5%); |
24 | $main-background-hover-color: #e9ecef; | 24 | $main-background-hover-color: #e9ecef; |
25 | 25 | ||
26 | $secondary-color: hsl(187, 77%, 34%); | ||
27 | |||
28 | $support-button: inherit; | 26 | $support-button: inherit; |
29 | $support-button-heart: #e83e8c; | 27 | $support-button-heart: #e83e8c; |
30 | 28 | ||
@@ -118,8 +116,6 @@ $variables: ( | |||
118 | --mainBackgroundColor: var(--mainBackgroundColor), | 116 | --mainBackgroundColor: var(--mainBackgroundColor), |
119 | --mainForegroundColor: var(--mainForegroundColor), | 117 | --mainForegroundColor: var(--mainForegroundColor), |
120 | 118 | ||
121 | --secondaryColor: var(--secondaryColor), | ||
122 | |||
123 | --greyForegroundColor: var(--greyForegroundColor), | 119 | --greyForegroundColor: var(--greyForegroundColor), |
124 | --greyBackgroundColor: var(--greyBackgroundColor), | 120 | --greyBackgroundColor: var(--greyBackgroundColor), |
125 | --greySecondaryBackgroundColor: var(--greySecondaryBackgroundColor), | 121 | --greySecondaryBackgroundColor: var(--greySecondaryBackgroundColor), |