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

Merge pull request #6340 from vector-im/luke/fix-TagPanel-enabled-when-settings-open 

Ensure entire LeftPanel is faded when settings open
pull/6342/head
Luke Barnard 2018-03-16 16:09:50 +00:00 committed by GitHub
parent 1e977b50df 71786116d8
commit 31cc29ad51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/structures/LeftPanel.js
View File

@ -186,12 +186,11 @@ var LeftPanel = React.createClass({
topBox = <SearchBox collapsed={ this.props.collapsed } onSearch={ this.onSearch } />;
}
let classes = classNames(
"mx_LeftPanel", "mx_fadable",
const classes = classNames(
"mx_LeftPanel",
{
"collapsed": this.props.collapsed,
"mx_fadable_faded": this.props.disabled,
}
},
);
const tagPanelEnabled =
@ -200,10 +199,11 @@ var LeftPanel = React.createClass({
const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;
const containerClasses = classNames(
"mx_LeftPanel_container",
"mx_LeftPanel_container", "mx_fadable",
{
"mx_LeftPanel_container_collapsed": this.props.collapsed,
"mx_LeftPanel_container_hasTagPanel": tagPanelEnabled,
"mx_fadable_faded": this.props.disabled,
},
);