From eccd74cfc9da41e7a28d7dd1558321e4613e7441 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Mon, 9 Nov 2020 20:12:23 -0600 Subject: [PATCH 1/3] Allow SearchBox to expand to fill width Signed-off-by: Aaron Raimist --- res/css/structures/_SearchBox.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/structures/_SearchBox.scss b/res/css/structures/_SearchBox.scss index 23ee06f7b3..6b9b2ee3aa 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; + flex: 1 1 0 !important; min-width: 0; &.mx_SearchBox_blurred:not(:hover) { From 32f7e3552cf4e5c68eea592324ac2384a560709f Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Sat, 5 Dec 2020 21:56:10 -0600 Subject: [PATCH 2/3] Remove globally defined flex and set just for group queries Signed-off-by: Aaron Raimist --- 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; } From 918326631f459bddf648b8de5558ca661ffaf8ad Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Tue, 8 Dec 2020 14:35:03 -0600 Subject: [PATCH 3/3] fix lint Signed-off-by: Aaron Raimist --- res/css/views/rooms/_MemberList.scss | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss index 591838e473..9753d3afb5 100644 --- a/res/css/views/rooms/_MemberList.scss +++ b/res/css/views/rooms/_MemberList.scss @@ -46,6 +46,11 @@ limitations under the License. } } +.mx_GroupMemberList_query, +.mx_GroupRoomList_query { + flex: 0 0 auto; +} + .mx_MemberList_chevron { position: absolute; right: 35px; @@ -60,21 +65,14 @@ limitations under the License. } .mx_MemberList_query { + height: 16px; + // 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; -} - .mx_MemberList_wrapper { padding: 10px; }