proper fix for element-hq#917 and resolve element-hq#928

ara4n · ara4n · commit ad9935739c96 · 2016-02-15T09:56:52.000+02:00
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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,14 @@ limitations under the License.`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`.mx_MemberList .mx_SearchableEntityList_expanded {`
`54`		`- flex: 1 1 100%;`
`55`		`- -webkit-flex: 1 1 100%;`
	`54`	`+ flex: 1 0 0;`
	`55`	`+ -webkit-flex: 1 0 0;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`.mx_MemberList_joined {`
`59`	`59`	`order: 2;`
`60`		`- flex: 1 1 100%;`
`61`		`- -webkit-flex: 1 1 100%;`
	`60`	`+ flex: 1 0 0;`
	`61`	`+ -webkit-flex: 1 0 0;`
`62`	`62`
`63`	`63`	`overflow-y: auto;`
`64`	`64`	`}`