From bd75234a2fa72555c35788cf8edb02f0b504a3cd Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 21 Jan 2016 00:39:26 +0000 Subject: [PATCH] make CSS work on FF --- .../css/matrix-react-sdk/views/rooms/MemberList.css | 10 ++++++---- .../views/rooms/SearchableEntityList.css | 5 +---- 2 files changed, 7 insertions(+), 8 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 5cbc1f019d..de05d3e8c4 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 0; - -webkit-flex: 1 1 0; + flex: 1 1 100%; + -webkit-flex: 1 1 100%; } .mx_MemberList_joined { order: 2; - flex: 1 1 auto; - -webkit-flex: 1 1 auto; + flex: 1 1 50%; + -webkit-flex: 1 1 50%; overflow-y: auto; } @@ -76,7 +76,9 @@ limitations under the License. order: 4; flex: 0 0 72px; -webkit-flex: 0 0 72px; +} +.mx_MemberList_bottomRule { border-top: 2px solid #e1dddd; margin-right: 15px; } diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css index 6709911870..3cdc291cc8 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css @@ -15,9 +15,6 @@ limitations under the License. */ .mx_SearchableEntityList { - flex: 1; - -webkit-flex: 1; - display: flex; display: -webkit-flex; @@ -66,7 +63,7 @@ limitations under the License. .mx_SearchableEntityList_hrWrapper { width: 100%; - flex: 0px; + flex: 0; -webkit-flex: 0; }