From c3ad8548683601b634dd40be797b82d1ae2d30cc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 2 Jul 2020 13:50:25 -0600
Subject: [PATCH 1/2] Fix alignment of avatars on community invites

---
 res/css/views/rooms/_RoomTile2.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index b11eb47d1c..38c30cf320 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -29,7 +29,7 @@ limitations under the License.
         border-radius: 32px;
     }
 
-    .mx_DecoratedRoomAvatar {
+    .mx_DecoratedRoomAvatar, .mx_RoomTile2_avatarContainer {
         margin-right: 8px;
     }
 

From e08512020f93cd78701ebc310e6ea9963e9809ad Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 2 Jul 2020 14:05:31 -0600
Subject: [PATCH 2/2] Fix a couple badge alignment issues with community
 invites

---
 res/css/views/avatars/_DecoratedRoomAvatar.scss | 3 ++-
 res/css/views/rooms/_RoomTile2.scss             | 2 +-
 src/components/views/rooms/TemporaryTile.tsx    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.scss b/res/css/views/avatars/_DecoratedRoomAvatar.scss
index 984fa0ce9a..b500d44a43 100644
--- a/res/css/views/avatars/_DecoratedRoomAvatar.scss
+++ b/res/css/views/avatars/_DecoratedRoomAvatar.scss
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_DecoratedRoomAvatar {
+// XXX: We shouldn't be using TemporaryTile anywhere - delete it.
+.mx_DecoratedRoomAvatar, .mx_TemporaryTile {
     position: relative;
 
     .mx_RoomTileIcon {
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 38c30cf320..d366e1b226 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -148,7 +148,7 @@ limitations under the License.
         align-items: center;
         position: relative;
 
-        .mx_DecoratedRoomAvatar {
+        .mx_DecoratedRoomAvatar, .mx_RoomTile2_avatarContainer {
             margin-right: 0;
         }
     }
diff --git a/src/components/views/rooms/TemporaryTile.tsx b/src/components/views/rooms/TemporaryTile.tsx
index 3087e738f1..b6c165ecda 100644
--- a/src/components/views/rooms/TemporaryTile.tsx
+++ b/src/components/views/rooms/TemporaryTile.tsx
@@ -56,6 +56,7 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
         // XXX: We copy classes because it's easier
         const classes = classNames({
             'mx_RoomTile2': true,
+            'mx_TemporaryTile': true,
             'mx_RoomTile2_selected': this.props.isSelected,
             'mx_RoomTile2_minimized': this.props.isMinimized,
         });
@@ -85,7 +86,6 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
         );
         if (this.props.isMinimized) nameContainer = null;
 
-        const avatarSize = 32;
         return (
             <React.Fragment>
                 <RovingTabIndexWrapper>