gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-03-16 16:09:56 +00:00
parent 154f55fafd 31cc29ad51
commit 2b526f3ea1
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 } />; topBox = <SearchBox collapsed={ this.props.collapsed } onSearch={ this.onSearch } />;
} }
let classes = classNames( const classes = classNames(
"mx_LeftPanel", "mx_fadable", "mx_LeftPanel",
{ {
"collapsed": this.props.collapsed, "collapsed": this.props.collapsed,
"mx_fadable_faded": this.props.disabled, },
}
); );
const tagPanelEnabled = const tagPanelEnabled =
@ -200,10 +199,11 @@ var LeftPanel = React.createClass({
const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />; const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;
const containerClasses = classNames( const containerClasses = classNames(
"mx_LeftPanel_container", "mx_LeftPanel_container", "mx_fadable",
{ {
"mx_LeftPanel_container_collapsed": this.props.collapsed, "mx_LeftPanel_container_collapsed": this.props.collapsed,
"mx_LeftPanel_container_hasTagPanel": tagPanelEnabled, "mx_LeftPanel_container_hasTagPanel": tagPanelEnabled,
"mx_fadable_faded": this.props.disabled,
}, },
); );