From c70736fe004c088ed29b840baaae3aac506c526c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 12 Sep 2019 11:11:32 +0200
Subject: [PATCH 1/3] make explore button and filter field equal width
---
res/css/structures/_LeftPanel.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 19b8907a28..8ea41d7740 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -136,7 +136,7 @@ limitations under the License.
}
.mx_LeftPanel_explore {
- flex: 0 0 40%;
+ flex: 0 0 50%;
overflow: hidden;
transition: flex-basis 0.2s;
box-sizing: border-box;
From 122e15156a055f8fbbb383792048ab2a358e2f6c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 12 Sep 2019 11:12:06 +0200
Subject: [PATCH 2/3] always show clear button in search box when focused
---
src/components/structures/SearchBox.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index a95cb74a8d..007ac88db2 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -125,7 +125,7 @@ module.exports = React.createClass({
if (this.props.collapsed) {
return null;
}
- const clearButton = this.state.searchTerm.length > 0 ?
+ const clearButton = !this.state.blurred ?
(<AccessibleButton key="button"
className="mx_SearchBox_closeButton"
onClick={ () => {this._clearSearch("button"); } }>
From e4a452e4bdce10fb6b0dc43a6276aefb64667aa6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 12 Sep 2019 11:27:20 +0200
Subject: [PATCH 3/3] reduce vertical padding around explore/filter
---
res/css/structures/_LeftPanel.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 8ea41d7740..b58467317d 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -132,6 +132,7 @@ limitations under the License.
.mx_SearchBox {
flex: 1 1 0;
min-width: 0;
+ margin: 4px 9px 1px 9px;
}
}
@@ -147,8 +148,7 @@ limitations under the License.
.mx_AccessibleButton {
font-size: 14px;
- margin: 9px;
- margin-right: 0;
+ margin: 4px 0 1px 9px;
padding: 9px;
padding-left: 42px;
font-weight: 600;