Merge branch 'develop' into travis/room-list/breadcrumbs

2020-06-08 18:11:42 -06:00
parent 04566e12b2 ae1d14d29f
commit bcc455b248
19 changed files with 546 additions and 26 deletions
--- a/res/css/structures/_LeftPanel2.scss
+++ b/res/css/structures/_LeftPanel2.scss
@@ -73,6 +73,11 @@ $roomListMinimizedWidth: 50px;
                font-weight: 600;
                font-size: $font-15px;
                line-height: $font-20px;
+                flex: 1;
+            }
+
+            .mx_LeftPanel2_headerButtons {
+                // No special styles: the rest of the layout happens to make it work.
            }

            .mx_LeftPanel2_breadcrumbsContainer {