OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3422 from matrix-org/bwindels/lp-visualfixes 

Left panel: visual fixes
pull/21833/head
Bruno Windels 2019-09-12 09:30:00 +00:00 committed by GitHub
parent ab6215f9aa 95060d4e95
commit 3c13210992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/css/structures/_LeftPanel.scss
View File

@ -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;
@ -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;

2
src/components/structures/SearchBox.js
View File

@ -126,7 +126,7 @@ module.exports = createReactClass({
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"); } }>