From: Chocobozzz <me@florianbigard.com>
Date: Fri, 10 Jun 2022 12:06:52 +0000 (+0200)
Subject: Remove secondary color theme
X-Git-Tag: v4.3.0-rc.1~540
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1fef6bccd939842408fdd666cc72fed9f2ef6456;p=github%2FChocobozzz%2FPeerTube.git

Remove secondary color theme
---

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 @@
 
       <td *ngIf="isSelected('quotaDaily')">
         <div class="progress" i18n-title title="Total daily video quota">
-          <div class="progress-bar secondary" role="progressbar" [style]="{ width: getUserVideoQuotaDailyPercentage(user) + '%' }"
+          <div class="progress-bar" role="progressbar" [style]="{ width: getUserVideoQuotaDailyPercentage(user) + '%' }"
                [attr.aria-valuenow]="user.rawVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.rawVideoQuotaDaily">
           </div>
           <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 {
   }
 
   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 @@
   <div *ngIf="hasDailyQuota()" class="mt-3">
     <label class="user-quota-title" tabindex="0" i18n>Daily video quota</label>
     <div class="progress" tabindex="0" [ngbTooltip]="titleVideoQuotaDaily()">
-      <div class="progress-bar secondary" role="progressbar" [style]="{ width: userVideoQuotaDailyPercentage + '%' }"
+      <div class="progress-bar" role="progressbar" [style]="{ width: userVideoQuotaDailyPercentage + '%' }"
         [attr.aria-valuenow]="userVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.videoQuotaDaily"></div>
       <span>{{ userVideoQuotaUsedDaily | bytes: 1 }}</span>
       <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 {
   --mainBackgroundColor: #{$bg-color};
   --mainForegroundColor: #{$fg-color};
 
-  --secondaryColor: #{$secondary-color};
-
   --greyForegroundColor: #{$grey-foreground-color};
   --greyBackgroundColor: #{$grey-background-color};
   --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/';
   }
 }
 
-.btn-outline-tertiary {
-  color: pvar(--secondaryColor);
-  border-color: pvar(--secondaryColor);
-
-  &:focus-within,
-  &:focus,
-  &:hover {
-    color: pvar(--mainBackgroundColor);
-    background-color: pvar(--secondaryColor);
-  }
-}
-
 .btn-group.select-button {
   font-weight: $font-semibold;
 
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 @@
     white-space: nowrap;
     transition: width 0.6s ease;
 
-    &.secondary {
-      background-color: pvar(--secondaryColor);
-    }
-
     &.red {
       background-color: lighten($color: #c54130, $amount: 10);
     }
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%);
 $main-hover-color: lighten($main-color, 5%);
 $main-background-hover-color: #e9ecef;
 
-$secondary-color: hsl(187, 77%, 34%);
-
 $support-button: inherit;
 $support-button-heart: #e83e8c;
 
@@ -118,8 +116,6 @@ $variables: (
   --mainBackgroundColor: var(--mainBackgroundColor),
   --mainForegroundColor: var(--mainForegroundColor),
 
-  --secondaryColor: var(--secondaryColor),
-
   --greyForegroundColor: var(--greyForegroundColor),
   --greyBackgroundColor: var(--greyBackgroundColor),
   --greySecondaryBackgroundColor: var(--greySecondaryBackgroundColor),