From 81298feb47a7cbc55e1a065ff9908985d83eecd5 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <jannemk@element.io>
Date: Wed, 15 Jun 2022 14:51:28 +0200
Subject: [PATCH 1/3] =?UTF-8?q?Update=20the=20avatar=20mask=20so=20it=20do?=
 =?UTF-8?q?esn=E2=80=99t=20cut=20off=20spaces=E2=80=99=20avatars=20anymore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/img/element-icons/roomlist/decorated-avatar-mask.svg | 5 +++--
 res/img/element-icons/roomlist/dnd-avatar-mask.svg       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/img/element-icons/roomlist/decorated-avatar-mask.svg b/res/img/element-icons/roomlist/decorated-avatar-mask.svg
index fb09c16bba5..1cca51666e9 100644
--- a/res/img/element-icons/roomlist/decorated-avatar-mask.svg
+++ b/res/img/element-icons/roomlist/decorated-avatar-mask.svg
@@ -1,3 +1,4 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M30.7161 22.2903C31.5425 20.3595 32 18.2332 32 16C32 7.16344 24.8366 0 16 0C7.16344 0 0 7.16344 0 16C0 24.8366 7.16344 32 16 32C18.2332 32 20.3595 31.5425 22.2903 30.7161C20.8956 29.6174 20 27.9133 20 26C20 22.6863 22.6863 20 26 20C27.9133 20 29.6174 20.8956 30.7161 22.2903Z" fill="black"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <path d="m 0,0 v 32 h 26 a 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 6,6 0 0 1 6,6 V 0 Z" />
 </svg>
diff --git a/res/img/element-icons/roomlist/dnd-avatar-mask.svg b/res/img/element-icons/roomlist/dnd-avatar-mask.svg
index 438d65e5023..0ff9f95d92d 100644
--- a/res/img/element-icons/roomlist/dnd-avatar-mask.svg
+++ b/res/img/element-icons/roomlist/dnd-avatar-mask.svg
@@ -1,3 +1,4 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M31.9999 16.0494C32 16.0329 32 16.0165 32 16C32 7.16344 24.8366 0 16 0C7.16344 0 0 7.16344 0 16C0 24.8366 7.16344 32 16 32C18.1985 32 20.2935 31.5566 22.2003 30.7543C21.4347 29.3403 21 27.7209 21 26C21 20.4772 25.4772 16 31 16C31.3375 16 31.671 16.0167 31.9999 16.0494Z" fill="#C1C6CD"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 0,0 V 32 H 23.033203 A 10,10 0 0 1 21,26 10,10 0 0 1 31,16 a 10,10 0 0 1 1,0.05078 V 0 Z" />
 </svg>

From 549093f85b846cedb920754682238b8e856d0988 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <jannemk@element.io>
Date: Wed, 15 Jun 2022 15:26:05 +0200
Subject: [PATCH 2/3] Remove unused mask

---
 res/img/element-icons/roomlist/dnd-avatar-mask.svg | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 res/img/element-icons/roomlist/dnd-avatar-mask.svg

diff --git a/res/img/element-icons/roomlist/dnd-avatar-mask.svg b/res/img/element-icons/roomlist/dnd-avatar-mask.svg
deleted file mode 100644
index 0ff9f95d92d..00000000000
--- a/res/img/element-icons/roomlist/dnd-avatar-mask.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 0,0 V 32 H 23.033203 A 10,10 0 0 1 21,26 10,10 0 0 1 31,16 a 10,10 0 0 1 1,0.05078 V 0 Z" />
-</svg>

From c160030aa550b31a507a135e72162dcc2dd28623 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <jannemk@element.io>
Date: Wed, 15 Jun 2022 15:35:54 +0200
Subject: [PATCH 3/3] Remove unused class

---
 res/css/structures/_UserMenu.scss | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
index 83dab52d9de..4d1b093b0b3 100644
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -39,13 +39,6 @@ limitations under the License.
         margin-left: 10px;
     }
 
-    .mx_UserMenu_cutout .mx_BaseAvatar {
-        mask-image: url('$(res)/img/element-icons/roomlist/dnd-avatar-mask.svg');
-        mask-position: center;
-        mask-size: contain;
-        mask-repeat: no-repeat;
-    }
-
     .mx_UserMenu_dndBadge {
         position: absolute;
         bottom: -2px;