mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
d05b221a6c
@ -238,9 +238,14 @@ var LeftPanel = React.createClass({
|
||||
}
|
||||
);
|
||||
|
||||
const containerClasses = classNames(
|
||||
"mx_LeftPanel_container",
|
||||
{ "mx_LeftPanel_container_collapsed": this.props.collapsed },
|
||||
);
|
||||
|
||||
return (
|
||||
<DragDropContext onDragEnd={this.onDragEnd}>
|
||||
<div className="mx_LeftPanel_container">
|
||||
<div className={containerClasses}>
|
||||
{ SettingsStore.isFeatureEnabled("feature_tag_panel") ? <TagPanel /> : <div /> }
|
||||
<aside className={classes} onKeyDown={ this._onKeyDown } onFocus={ this._onFocus } onBlur={ this._onBlur }>
|
||||
{ topBox }
|
||||
|
@ -15,7 +15,7 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
.mx_TagPanel {
|
||||
width: 60px;
|
||||
flex: 0 0 60px;
|
||||
background-color: $tertiary-accent-color;
|
||||
cursor: pointer;
|
||||
|
||||
|
@ -23,7 +23,12 @@ limitations under the License.
|
||||
|
||||
.mx_LeftPanel_container {
|
||||
display: flex;
|
||||
flex: 0 0 235px;
|
||||
flex: 0 0 295px;
|
||||
}
|
||||
|
||||
.mx_LeftPanel_container_collapsed {
|
||||
/* TagPanel 60px + Collapsed LeftPanel 60px */
|
||||
flex: 0 0 120px;
|
||||
}
|
||||
|
||||
.mx_LeftPanel_hideButton {
|
||||
|
Loading…
Reference in New Issue
Block a user