From 371a3c0d36598daab0dbc429d01f60e6e2de6abc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Feb 2023 14:51:40 +0000
Subject: [PATCH] Apply more general fix for base avatar regressions (#10045)

---
 res/css/structures/_UserMenu.pcss      |  2 --
 res/css/views/avatars/_BaseAvatar.pcss | 11 +----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/res/css/structures/_UserMenu.pcss b/res/css/structures/_UserMenu.pcss
index f43d773e3d..08ef8947ee 100644
--- a/res/css/structures/_UserMenu.pcss
+++ b/res/css/structures/_UserMenu.pcss
@@ -25,8 +25,6 @@ limitations under the License.
 
         .mx_UserMenu_userAvatar {
             position: relative;
-            /* without this a default avatar will cause this to be 4px oversized and out of alignment */
-            display: inherit;
 
             .mx_BaseAvatar {
                 pointer-events: none; /* makes the avatar non-draggable */
diff --git a/res/css/views/avatars/_BaseAvatar.pcss b/res/css/views/avatars/_BaseAvatar.pcss
index a6a4b0b74b..43e273b6ff 100644
--- a/res/css/views/avatars/_BaseAvatar.pcss
+++ b/res/css/views/avatars/_BaseAvatar.pcss
@@ -16,16 +16,7 @@ limitations under the License.
 
 .mx_BaseAvatar {
     position: relative;
-    /* In at least Firefox, the case of relative positioned inline elements */
-    /* (such as mx_BaseAvatar) with absolute positioned children (such as */
-    /* mx_BaseAvatar_initial) is a dark corner full of spider webs. It will give */
-    /* different results during full reflow of the page vs. incremental reflow */
-    /* of small portions. While that's surely a browser bug, we can avoid it by */
-    /* using `inline-block` instead of the default `inline`. */
-    /* https://github.com/vector-im/element-web/issues/5594 */
-    /* https://bugzilla.mozilla.org/show_bug.cgi?id=1535053 */
-    /* https://bugzilla.mozilla.org/show_bug.cgi?id=255139 */
-    display: inline-block;
+    display: block;
     user-select: none;
 
     &.mx_RoomAvatar_isSpaceRoom {