From a5297303b04e167bef783f7e5e794dca3b3d47de Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 24 Jan 2019 15:44:16 +0100 Subject: [PATCH] remove flexbox layout --- res/css/structures/_RoomSubList.scss | 25 ++----------------------- res/css/views/rooms/_RoomList.scss | 9 +++++---- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss index faaf1cf462..e403057cd3 100644 --- a/res/css/structures/_RoomSubList.scss +++ b/res/css/structures/_RoomSubList.scss @@ -32,34 +32,13 @@ limitations under the License. */ .mx_RoomSubList { - min-height: 31px; - flex: 0 10000 auto; display: flex; flex-direction: column; } -.mx_RoomSubList.resized-sized { - /* - flex-basis to 0 so sublists - are not shrinking/growing relative - to their content (as would be the case with auto), - as this intervenes with sizing an item exactly - when not available space is available - in the flex container - */ - flex: 1 1 0; -} -.mx_RoomSubList_nonEmpty { - min-height: 74px; - - .mx_AutoHideScrollbar_offset { - padding-bottom: 4px; - } -} - -.mx_RoomSubList_hidden { - flex: none !important; +.mx_RoomSubList_nonEmpty .mx_AutoHideScrollbar_offset { + padding-bottom: 4px; } .mx_RoomSubList_labelContainer { diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss index 8f78e3bb7a..360966a952 100644 --- a/res/css/views/rooms/_RoomList.scss +++ b/res/css/views/rooms/_RoomList.scss @@ -17,13 +17,14 @@ limitations under the License. .mx_RoomList { /* take up remaining space below TopLeftMenu */ - flex: 1 1 auto; - /* use flexbox to layout sublists */ - display: flex; - flex-direction: column; + flex: 1; min-height: 0; } +.mx_RoomList .mx_ResizeHandle { + position: relative; +} + .mx_SearchBox { flex: none; }