Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Left panel: visual fixes #3426

Merged
merged 3 commits into from
Sep 12, 2019
Merged

Left panel: visual fixes #3426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c70736f
make explore button and filter field equal width
bwindels Sep 12, 2019
122e151
always show clear button in search box when focused
bwindels Sep 12, 2019
e4a452e
reduce vertical padding around explore/filter
bwindels Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions res/css/structures/_LeftPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,12 @@ limitations under the License.
.mx_SearchBox {
flex: 1 1 0;
min-width: 0;
margin: 4px 9px 1px 9px;
}
}

.mx_LeftPanel_explore {
flex: 0 0 40%;
flex: 0 0 50%;
overflow: hidden;
transition: flex-basis 0.2s;
box-sizing: border-box;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/structures/SearchBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"); } }>
Expand Down