mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 10:27:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-02-13 22:03:03 +00:00
commit d05b221a6c
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/LeftPanel.js
View file

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

2
src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
View file

@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_TagPanel {
width: 60px;
flex: 0 0 60px;
background-color: $tertiary-accent-color;
cursor: pointer;

7
src/skins/vector/css/vector-web/structures/_LeftPanel.scss
View file

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