diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss
index 59ad7da35526..98fc4d0279c1 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.scss
+++ b/client/src/app/+admin/users/user-list/user-list.component.scss
@@ -54,7 +54,7 @@ my-global-icon {
}
.progress {
- @include progressbar;
+ @include progressbar($small: true);
width: auto;
max-width: 100%;
}
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 f9fb32133b2a..06981223a145 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
@@ -1,21 +1,22 @@
-
Total video quota
+
- {{ userVideoQuotaUsed | bytes: 0 }}
-
{{ userVideoQuota }}
+ [attr.aria-valuenow]="userVideoQuotaUsed" aria-valuemin="0" [attr.aria-valuemax]="user.videoQuota">
+
{{ userVideoQuotaUsed | bytes: 1 }}
+
{{ userVideoQuota }}
-
Daily video quota
+
- {{ userVideoQuotaUsedDaily | bytes: 0 }}
+ [attr.aria-valuenow]="userVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.videoQuotaDaily">
{{ userVideoQuotaDaily }}
+
{{ userVideoQuotaUsedDaily | bytes: 1 }}
+
{{ userVideoQuotaDaily }}
\ No newline at end of file
diff --git a/client/src/app/shared/shared-main/users/user-quota.component.scss b/client/src/app/shared/shared-main/users/user-quota.component.scss
index 904add0f451b..c670559d33a5 100644
--- a/client/src/app/shared/shared-main/users/user-quota.component.scss
+++ b/client/src/app/shared/shared-main/users/user-quota.component.scss
@@ -1,10 +1,12 @@
@import '_variables';
@import '_mixins';
-.user-quota {
- font-size: 15px;
- margin-top: 20px;
+label {
+ font-weight: $font-regular;
+ font-size: 100%;
+}
+.user-quota {
label {
margin-right: 5px;
}
@@ -13,12 +15,9 @@
width: 100% !important;
}
- .user-quota-title, .progress {
+ .progress {
@include disable-outline;
@include button-focus(pvar(--mainColorLightest));
- }
-
- .progress {
@include progressbar;
height: 2rem;
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 0fb54f121288..ee2fe04978ac 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -683,7 +683,7 @@
}
}
-@mixin progressbar {
+@mixin progressbar($small: false) {
background-color: $grey-background-color;
display: flex;
height: 1rem;
@@ -695,7 +695,9 @@
span {
position: absolute;
color: $grey-foreground-color;
- top: -1px;
+ @if $small {
+ top: -1px;
+ }
&:nth-of-type(1) {
left: .2rem;