From ad9935739c96caeedfdd778ca681c42e281924f9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 09:56:52 +0200
Subject: [PATCH] proper fix for
 https://github.com/vector-im/vector-web/issues/917 and resolve
 https://github.com/vector-im/vector-web/issues/928

---
 .../css/matrix-react-sdk/views/rooms/MemberList.css       | 8 ++++----
 src/skins/vector/css/vector-web/structures/RightPanel.css | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
index 4433c1e945..fb24cc3cec 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
@@ -51,14 +51,14 @@ limitations under the License.
 }
 
 .mx_MemberList .mx_SearchableEntityList_expanded {
-    flex: 1 1 100%;
-    -webkit-flex: 1 1 100%;
+    flex: 1 0 0;
+    -webkit-flex: 1 0 0;
 }
 
 .mx_MemberList_joined {
     order: 2;
-    flex: 1 1 100%;
-    -webkit-flex: 1 1 100%;
+    flex: 1 0 0;
+    -webkit-flex: 1 0 0;
 
     overflow-y: auto;
 }
diff --git a/src/skins/vector/css/vector-web/structures/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css
index f61282b6ca..12e101a37a 100644
--- a/src/skins/vector/css/vector-web/structures/RightPanel.css
+++ b/src/skins/vector/css/vector-web/structures/RightPanel.css
@@ -17,8 +17,6 @@ limitations under the License.
 .mx_RightPanel {
     position: relative;
 
-    height: 100%; /* needed for memberlist flexbox to work in chrome 48+ */
-
     display: -webkit-box;
     display: -moz-box;
     display: -ms-flexbox;