From 32f7e3552cf4e5c68eea592324ac2384a560709f Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Sat, 5 Dec 2020 21:56:10 -0600
Subject: [PATCH] Remove globally defined flex and set just for group queries

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 res/css/_common.scss                 |  1 -
 res/css/structures/_SearchBox.scss   |  2 +-
 res/css/views/rooms/_MemberList.scss | 11 ++++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 7ab88d6f02..87336a1c03 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -170,7 +170,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
         border: 1px solid rgba($primary-fg-color, .1);
         // these things should probably not be defined globally
         margin: 9px;
-        flex: 0 0 auto;
     }
 
     .mx_textinput {
diff --git a/res/css/structures/_SearchBox.scss b/res/css/structures/_SearchBox.scss
index 6b9b2ee3aa..23ee06f7b3 100644
--- a/res/css/structures/_SearchBox.scss
+++ b/res/css/structures/_SearchBox.scss
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 .mx_SearchBox {
-    flex: 1 1 0 !important;
+    flex: 1 1 0;
     min-width: 0;
 
     &.mx_SearchBox_blurred:not(:hover) {
diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index f00907aeef..591838e473 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -59,17 +59,18 @@ limitations under the License.
     flex: 1 1 0px;
 }
 
-.mx_MemberList_query,
-.mx_GroupMemberList_query,
-.mx_GroupRoomList_query {
-    flex: 1 1 0;
-
+.mx_MemberList_query {
     // stricter rule to override the one in _common.scss
     &[type="text"] {
         font-size: $font-12px;
     }
 }
 
+.mx_GroupMemberList_query,
+.mx_GroupRoomList_query {
+    flex: 0 0 auto;
+}
+
 .mx_MemberList_query {
     height: 16px;
 }