gaja-group
/
element-web
forked from matrix/element-web
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-02-13 22:03:03 +00:00
parent 54f4563303 7aea7f9400
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 ( return (
<DragDropContext onDragEnd={this.onDragEnd}> <DragDropContext onDragEnd={this.onDragEnd}>
<div className="mx_LeftPanel_container"> <div className={containerClasses}>
{ SettingsStore.isFeatureEnabled("feature_tag_panel") ? <TagPanel /> : <div /> } { SettingsStore.isFeatureEnabled("feature_tag_panel") ? <TagPanel /> : <div /> }
<aside className={classes} onKeyDown={ this._onKeyDown } onFocus={ this._onFocus } onBlur={ this._onBlur }> <aside className={classes} onKeyDown={ this._onKeyDown } onFocus={ this._onFocus } onBlur={ this._onBlur }>
{ topBox } { topBox }

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

@ -15,7 +15,7 @@ limitations under the License.
*/ */
.mx_TagPanel { .mx_TagPanel {
width: 60px; flex: 0 0 60px;
background-color: $tertiary-accent-color; background-color: $tertiary-accent-color;
cursor: pointer; 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 { .mx_LeftPanel_container {
display: flex; 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 { .mx_LeftPanel_hideButton {