matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

use main element for room/group view

Browse Source
This commit is contained in:
Bruno Windels
2018-11-02 15:05:55 +01:00
parent 7c2e5ba853
commit 9be4598a0e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/GroupView.js
View File

@@ -1292,7 +1292,7 @@ export default React.createClass({
}; };
return ( return (
<div className="mx_GroupView"> <main className="mx_GroupView">
<div className={classnames(headerClasses)}> <div className={classnames(headerClasses)}>
<div className="mx_GroupView_header_leftCol"> <div className="mx_GroupView_header_leftCol">
<div className="mx_GroupView_header_avatar"> <div className="mx_GroupView_header_avatar">
@@ -1318,7 +1318,7 @@ export default React.createClass({
{ this._getGroupSection() } { this._getGroupSection() }
</GeminiScrollbarWrapper> </GeminiScrollbarWrapper>
</MainSplit> </MainSplit>
</div> </main>
); );
} else if (this.state.error) { } else if (this.state.error) {
if (this.state.error.httpStatus === 404) { if (this.state.error.httpStatus === 404) {

4
src/components/structures/RoomView.js
View File

@@ -1820,7 +1820,7 @@ module.exports = React.createClass({
const rightPanel = this.state.room ? <RightPanel roomId={this.state.room.roomId} /> : undefined; const rightPanel = this.state.room ? <RightPanel roomId={this.state.room.roomId} /> : undefined;
return ( return (
<div className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref="roomView"> <main className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref="roomView">
<RoomHeader ref="header" room={this.state.room} searchInfo={searchInfo} <RoomHeader ref="header" room={this.state.room} searchInfo={searchInfo}
oobData={this.props.oobData} oobData={this.props.oobData}
editing={this.state.editingRoomSettings} editing={this.state.editingRoomSettings}
@@ -1850,7 +1850,7 @@ module.exports = React.createClass({
{ messageComposer } { messageComposer }
</div> </div>
</MainSplit> </MainSplit>
</div> </main>
); );
}, },
}); });