From 8099791b320a4e97c148572348dc4cc7d8590376 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Sat, 11 Sep 2021 11:39:44 -0400
Subject: [PATCH 1/4] Fix various message bubble alignment issues

Signed-off-by: Robin Townsend <robin@robin.town>
---
 res/css/views/rooms/_EventBubbleTile.scss | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index 41c9dad394a..d10353a663a 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -26,7 +26,7 @@ limitations under the License.
 
     position: relative;
     margin-top: var(--gutterSize);
-    margin-left: 50px;
+    margin-left: 49px;
     margin-right: 100px;
 
     &.mx_EventTile_continuation {
@@ -287,6 +287,7 @@ limitations under the License.
     .mx_EventTile_line,
     .mx_EventTile_info {
         min-width: 100%;
+        margin: 0;
     }
 
     .mx_EventTile_e2eIcon {
@@ -295,8 +296,8 @@ limitations under the License.
 
     .mx_EventTile_line > a {
         right: auto;
-        top: -15px;
-        left: -68px;
+        top: -11px;
+        left: -95px;
     }
 }
 
@@ -326,11 +327,9 @@ limitations under the License.
     }
 
     .mx_EventTile_line {
-        margin: 0 5px;
+        margin: 0;
         > a {
-            left: auto;
-            right: 0;
-            transform: translateX(calc(100% + 5px));
+            left: -76px;
         }
     }
 
@@ -340,7 +339,7 @@ limitations under the License.
 }
 
 .mx_EventListSummary[data-expanded=false][data-layout=bubble] {
-    padding: 0 34px;
+    padding: 0 49px;
 }
 
 /* events that do not require bubble layout */

From 2c0835ed9bc5dce77a5851398cbbcfa2d720621d Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Tue, 14 Sep 2021 11:27:03 -0400
Subject: [PATCH 2/4] Add comments to message bubble magic numbers

Signed-off-by: Robin Townsend <robin@robin.town>
---
 res/css/views/rooms/_EventBubbleTile.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index d10353a663a..262fb89bba9 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -23,7 +23,6 @@ limitations under the License.
 }
 
 .mx_EventTile[data-layout=bubble] {
-
     position: relative;
     margin-top: var(--gutterSize);
     margin-left: 49px;
@@ -287,6 +286,7 @@ limitations under the License.
     .mx_EventTile_line,
     .mx_EventTile_info {
         min-width: 100%;
+        // Preserve alignment with left edge of text in bubbles
         margin: 0;
     }
 
@@ -295,6 +295,7 @@ limitations under the License.
     }
 
     .mx_EventTile_line > a {
+        // Align timestamps with those of normal bubble tiles
         right: auto;
         top: -11px;
         left: -95px;
@@ -329,6 +330,7 @@ limitations under the License.
     .mx_EventTile_line {
         margin: 0;
         > a {
+            // Align timestamps with those of normal bubble tiles
             left: -76px;
         }
     }
@@ -339,6 +341,7 @@ limitations under the License.
 }
 
 .mx_EventListSummary[data-expanded=false][data-layout=bubble] {
+    // Align with left edge of bubble tiles
     padding: 0 49px;
 }
 

From 8824b120649d908fd8e17825d09b223792e9f964 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Tue, 14 Sep 2021 12:35:51 -0400
Subject: [PATCH 3/4] Fix alignment of sender name in message bubble replies

Signed-off-by: Robin Townsend <robin@robin.town>
---
 res/css/views/rooms/_EventBubbleTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index 262fb89bba9..ee473c4af22 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -76,7 +76,7 @@ limitations under the License.
         max-width: 70%;
     }
 
-    .mx_SenderProfile {
+    > .mx_SenderProfile {
         position: relative;
         top: -2px;
         left: 2px;

From 9b3da61ae4d79f598ad2583e5be67e4b67139f0d Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Tue, 14 Sep 2021 12:37:45 -0400
Subject: [PATCH 4/4] Remove unnecessary unset

Signed-off-by: Robin Townsend <robin@robin.town>
---
 res/css/views/rooms/_EventBubbleTile.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index ee473c4af22..16037771130 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -112,8 +112,6 @@ limitations under the License.
 
         .mx_ReplyTile .mx_SenderProfile {
             display: block;
-            top: unset;
-            left: unset;
         }
 
         .mx_ReactionsRow {