From 424aeb12bd16f5d6763dfa2860d113cc93876405 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 25 May 2022 08:55:21 +0200
Subject: Fix upload avatar button

---
 .../src/app/shared/shared-actor-image-edit/actor-image-edit.scss  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'client')

diff --git a/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss b/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss
index c4fe5a59e..93bdaba57 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss
+++ b/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss
@@ -16,10 +16,12 @@
 }
 
 .actor-img-edit-button {
-  @include peertube-button-file(21px);
-  @include button-with-icon(19px);
+  @include peertube-button-file(30px);
   @include orange-button;
 
+  display: flex;
+  justify-content: center;
+  padding: 0;
   margin-top: 10px;
   margin-bottom: 5px;
   cursor: pointer;
@@ -30,6 +32,6 @@
   }
 
   my-global-icon {
-    right: 7px;
+    width: 19px;
   }
 }
-- 
cgit v1.2.3


From a220b84b0e29c7ce1b32166aec07870696a28ef9 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 25 May 2022 09:10:20 +0200
Subject: Fix avatars in notifications

---
 client/src/app/shared/shared-main/account/actor.model.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'client')

diff --git a/client/src/app/shared/shared-main/account/actor.model.ts b/client/src/app/shared/shared-main/account/actor.model.ts
index 6be6b75d0..6e45ba588 100644
--- a/client/src/app/shared/shared-main/account/actor.model.ts
+++ b/client/src/app/shared/shared-main/account/actor.model.ts
@@ -21,11 +21,11 @@ export abstract class Actor implements ServerActor {
   isLocal: boolean
 
   static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size?: number) {
-    const avatars = actor.avatars.sort((a, b) => b.width - a.width)
+    const avatarsAscWidth = actor.avatars.sort((a, b) => a.width - b.width)
 
     const avatar = size
-      ? avatars.find(a => a.width >= size)
-      : avatars[0]
+      ? avatarsAscWidth.find(a => a.width >= size)
+      : avatarsAscWidth[avatarsAscWidth.length - 1] // Bigger one
 
     if (!avatar) return ''
     if (avatar.url) return avatar.url
-- 
cgit v1.2.3


From 994b474331262ca17e5057aaea456251f45c0ed2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 25 May 2022 11:04:59 +0200
Subject: Fix job progress column

---
 client/src/app/+admin/system/jobs/jobs.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html
index 638d2380a..301591786 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.html
+++ b/client/src/app/+admin/system/jobs/jobs.component.html
@@ -65,7 +65,7 @@
         <span class="badge" [ngClass]="getJobStateClass(job.state)">{{ job.state }}</span>
       </td>
 
-      <td class="job-progress c-hand" [pRowToggler]="job">
+      <td *ngIf="hasGlobalProgress()" class="job-progress c-hand" [pRowToggler]="job">
         <ng-container *ngIf="hasProgress(job)">{{ getProgress(job) }}</ng-container>
       </td>
 
-- 
cgit v1.2.3