From 90dfb8d61f884a6e951023f6829e322467e680a4 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 25 May 2022 07:36:12 +0000 Subject: [PATCH] Move style rules related to ThreadPanel from EventTile (#8683) Signed-off-by: Suguru Hirahara --- res/css/views/right_panel/_ThreadPanel.scss | 6 ++++++ res/css/views/rooms/_EventTile.scss | 13 ------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss index 4e93b00116..7b8d4d4746 100644 --- a/res/css/views/right_panel/_ThreadPanel.scss +++ b/res/css/views/right_panel/_ThreadPanel.scss @@ -120,6 +120,8 @@ limitations under the License. } &.mx_ThreadView { + max-height: 100%; + // Inside a thread timeline only .mx_GenericEventListSummary { &:not([data-layout=bubble]) > .mx_EventTile_line { @@ -137,6 +139,10 @@ limitations under the License. border-radius: 8px; } } + + .mx_MessageComposer_sendMessage { + margin-right: 0; + } } .mx_RoomView_messagePanel { // To avoid the rule from being applied to .mx_ThreadPanel_empty diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index bdf14dee4e..07f2ce1414 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -848,15 +848,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss --ThreadView_group_spacing-start: 56px; // 56px: 64px - 8px (padding) --ThreadView_group_spacing-end: 8px; // same as padding - display: flex; - flex-direction: column; - max-height: 100%; - - .mx_ThreadView_List { - flex: 1; - overflow: scroll; - } - .mx_EventTile_roomName { display: none; } @@ -985,8 +976,4 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss } } } - - .mx_MessageComposer_sendMessage { - margin-right: 0; - } }