From 70c10886c4ecb5cb0be94b67899ea421426cbe55 Mon Sep 17 00:00:00 2001
From: Germain <germains@element.io>
Date: Wed, 6 Apr 2022 11:48:58 +0100
Subject: [PATCH] Port #8240 to release (#8241)

* fix uneven gutter size in thread panel

* Fix indicator positioning

* fix gutter sizing

* fix dropdown inner padding and spacing

* lint fix
---
 res/css/structures/_RoomView.scss           |  4 ++--
 res/css/views/right_panel/_ThreadPanel.scss | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 7990db8cf1..84e6041ecd 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -326,8 +326,8 @@ hr.mx_RoomView_myReadMarker {
 
 .mx_Indicator {
     position: absolute;
-    right: 0;
-    top: 0;
+    right: -3px;
+    top: -3px;
     width: $dot-size;
     height: $dot-size;
     border-radius: 50%;
diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss
index cb77f365b8..89b3f8aeb9 100644
--- a/res/css/views/right_panel/_ThreadPanel.scss
+++ b/res/css/views/right_panel/_ThreadPanel.scss
@@ -20,8 +20,8 @@ limitations under the License.
     height: 100px;
     overflow: visible;
 
-    &.mx_BaseCard {
-        padding-right: 0;
+    &:not(.mx_ThreadView).mx_BaseCard {
+        padding-right: 2px;
     }
 
     .mx_BaseCard_header {
@@ -48,7 +48,7 @@ limitations under the License.
     }
 
     .mx_ThreadPanel__header {
-        width: calc(100% - 30px);
+        width: calc(100% - 38px);
         height: 24px;
         display: flex;
         flex: 1;
@@ -118,7 +118,7 @@ limitations under the License.
     &.mx_ThreadView .mx_ThreadView_timelinePanelWrapper {
         /* the scrollbar is 8px wide, and we want a 12px gap with the side of the
         panel. Hence the magic number, 8+4=12 */
-        width: calc(100% - 4px);
+        width: calc(100% + 6px);
         padding-right: 4px;
         position: relative;
         min-height: 0; // don't displace the composer
@@ -184,7 +184,7 @@ limitations under the License.
     }
 
     .mx_ThreadPanel_dropdown {
-        padding: 3px 8px;
+        padding: 3px 4px 3px 8px;
         border-radius: 4px;
         line-height: 1.5;
         user-select: none;
@@ -294,7 +294,7 @@ limitations under the License.
     top: 0;
     bottom: 0;
     left: 0;
-    right: 0;
+    right: 6px;
     padding: 20px;
 
     h2 {