From 913c818bb8d2bf25445ca0d5b866181d9ac9029d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jul 2022 13:13:21 +0100
Subject: [PATCH 1/2] Fix avatars in percy not having the right border radius

---
 res/css/views/avatars/_BaseAvatar.pcss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/avatars/_BaseAvatar.pcss b/res/css/views/avatars/_BaseAvatar.pcss
index 802a4235c13..67c285f511a 100644
--- a/res/css/views/avatars/_BaseAvatar.pcss
+++ b/res/css/views/avatars/_BaseAvatar.pcss
@@ -55,7 +55,6 @@ limitations under the License.
 
 // Percy screenshot test specific CSS
 @media only percy {
-    .mx_BaseAvatar_initial,
     .mx_BaseAvatar_initial + .mx_BaseAvatar_image {
         // Stick the default room avatar colour, so it doesn't cause a false diff on the screenshot
         background-color: $username-variant2-color !important;

From 5447014e3feb4ea95d8724d71a4385051e1c8aee Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 Jul 2022 14:26:02 +0100
Subject: [PATCH 2/2] Fix percy media for base avatars

---
 res/css/views/avatars/_BaseAvatar.pcss | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/res/css/views/avatars/_BaseAvatar.pcss b/res/css/views/avatars/_BaseAvatar.pcss
index 67c285f511a..0356264084f 100644
--- a/res/css/views/avatars/_BaseAvatar.pcss
+++ b/res/css/views/avatars/_BaseAvatar.pcss
@@ -55,8 +55,15 @@ limitations under the License.
 
 // Percy screenshot test specific CSS
 @media only percy {
-    .mx_BaseAvatar_initial + .mx_BaseAvatar_image {
-        // Stick the default room avatar colour, so it doesn't cause a false diff on the screenshot
+    // Stick the default room avatar colour, so it doesn't cause a false diff on the screenshot
+    .mx_BaseAvatar_initial {
         background-color: $username-variant2-color !important;
+        border-radius: 125px;
+    }
+    .mx_RoomAvatar_isSpaceRoom .mx_BaseAvatar_initial {
+        border-radius: 8px;
+    }
+    .mx_BaseAvatar_initial + .mx_BaseAvatar_image {
+        visibility: hidden;
     }
 }