Fix regressions: chat panel with a maximized widget

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
matrix-org · Apr 28, 2022 · addd6a7 · addd6a7
1 parent ef33183
commit addd6a7
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 18 deletions.
diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss
@@ -111,6 +111,32 @@ limitations under the License.
         overflow-y: scroll; // set gap between the thread tile and the right border
     }
 
+    .mx_GroupLayout {
+        .mx_EventTile {
+            > .mx_DisambiguatedProfile {
+                margin-inline-start: 0;
+                line-height: normal;
+            }
+
+            .mx_MessageTimestamp {
+                position: initial;
+                width: auto;
+            }
+        }
+    }
+
+    // chat panel with a maximized widget
+    &.mx_TimelineCard {
+        .mx_GroupLayout {
+            .mx_EventTile {
+                .mx_MessageTimestamp {
+                    position: absolute;
+                    width: $MessageTimestamp_width;
+                }
+            }
+        }
+    }
+
     &.mx_ThreadView .mx_ThreadView_timelinePanelWrapper {
         position: relative;
         min-height: 0; // don't displace the composer

diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss
@@ -42,11 +42,6 @@ limitations under the License.
         border-radius: 8px;
     }
 
-    .mx_AutoHideScrollbar {
-        padding-right: 10px;
-        width: calc(100% - 10px);
-    }
-
     .mx_NewRoomIntro {
         margin-left: 36px;
     }

diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
@@ -19,30 +19,27 @@ $left-gutter: 64px;
 
 .mx_GroupLayout {
     .mx_EventTile {
+        > .mx_DisambiguatedProfile {
+            line-height: $font-20px;
+            margin-left: $left-gutter;
+        }
+
         > .mx_EventTile_avatar {
             position: absolute;
             z-index: 9;
         }
 
+        .mx_MessageTimestamp {
+            position: absolute;
+            width: $MessageTimestamp_width;
+        }
+
         .mx_EventTile_line,
         .mx_EventTile_reply {
             padding-top: 1px;
             padding-bottom: 3px;
             line-height: $font-22px;
         }
-
-        // See: _EventTile.scss
-        &:not([data-shape="ThreadsList"]) {
-            .mx_MessageTimestamp {
-                position: absolute;
-                width: $MessageTimestamp_width;
-            }
-
-            > .mx_DisambiguatedProfile {
-                line-height: $font-20px;
-                margin-left: $left-gutter;
-            }
-        }
     }
 }