mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-25 18:55:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'experimental' into bwindels/roomsectionheadercleanup

Browse source
This commit is contained in:
Bruno Windels 2018-10-22 10:31:07 +02:00
commit f42ab32e05
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/css/structures/_RoomSubList.scss
View file

@ -132,6 +132,11 @@ limitations under the License.
transform: rotateZ(-90deg);
}
.mx_RoomSubList .gm-scrollbar-container {
/* let rooms list grab all available space */
flex: 1;
}
.collapsed {
.mx_RoomSubList_label {
height: 17px;

2
src/Tinter.js
View file

@ -155,7 +155,7 @@ class Tinter {
tint(primaryColor, secondaryColor, tertiaryColor) {
return;
// eslint-disable-next-line no-unreachable
this.currentTint[0] = primaryColor;
this.currentTint[1] = secondaryColor;
this.currentTint[2] = tertiaryColor;

6
src/components/structures/LoggedInView.js
View file

@ -412,6 +412,10 @@ const LoggedInView = React.createClass({
this.setState({mouseDown: null});
},
_setResizeContainerRef(div) {
this.resizeContainer = div;
},
render: function() {
const LeftPanel = sdk.getComponent('structures.LeftPanel');
const RightPanel = sdk.getComponent('structures.RightPanel');
@ -558,7 +562,7 @@ const LoggedInView = React.createClass({
<div className='mx_MatrixChat_wrapper' aria-hidden={this.props.hideToSRUsers} onMouseDown={this._onMouseDown} onMouseUp={this._onMouseUp}>
{ topBar }
<DragDropContext onDragEnd={this._onDragEnd}>
<div ref={(div) => this.resizeContainer = div} className={bodyClasses}>
<div ref={this._setResizeContainerRef} className={bodyClasses}>
<LeftPanel
collapsed={this.props.collapseLhs || this.state.collapseLhs || false}
disabled={this.props.leftDisabled}

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

@ -17,7 +17,6 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import sdk from '../../index';
import dis from '../../dispatcher';
class TopLeftMenu extends React.Component {
@ -30,7 +29,7 @@ class TopLeftMenu extends React.Component {
render() {
const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
const avatarHeight = 28;
const name = "My stuff"
const name = "My stuff";
return (
<div className="mx_TopLeftMenu">
@ -43,10 +42,10 @@ class TopLeftMenu extends React.Component {
<div className="mx_TopLeftMenu_name">
{ name }
</div>
<img className="mx_TopLeftMenu_chevron" src="img/topleft-chevron.svg" width="11" height="6"/>
<img className="mx_TopLeftMenu_chevron" src="img/topleft-chevron.svg" width="11" height="6" />
</div>
);
}
}
module.exports = TopLeftMenu;
module.exports = TopLeftMenu;

6
src/resizer/resizer.js
View file

@ -40,7 +40,7 @@ export class Resizer {
vertical: "resizer-vertical",
resizing: "resizer-resizing",
};
this.mouseDownHandler = (event) => this._onMouseDown(event);
this._onMouseDown = this._onMouseDown.bind(this);
}
setClassNames(classNames) {
@ -48,11 +48,11 @@ export class Resizer {
}
attach() {
this.container.addEventListener("mousedown", this.mouseDownHandler, false);
this.container.addEventListener("mousedown", this._onMouseDown, false);
}
detach() {
this.container.removeEventListener("mousedown", this.mouseDownHandler, false);
this.container.removeEventListener("mousedown", this._onMouseDown, false);
}
/**