mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Add MatrixToolbar CSS. Make the toolbar part of RoomView and don't cover the UI (shift it instead)

Browse source
This commit is contained in:
Kegan Dougal 2015-07-21 16:12:08 +01:00
parent c1de5e9e95
commit 2698405e2f
5 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
skins/base/views/organisms/RoomView.js
View file

@ -31,7 +31,8 @@ var RoomHeader = ComponentBroker.get('molecules/RoomHeader');
var MessageComposer = ComponentBroker.get('molecules/MessageComposer');
var CallView = ComponentBroker.get("molecules/voip/CallView");
var RoomSettings = ComponentBroker.get("molecules/RoomSettings");
var Notifier = ComponentBroker.get('organisms/Notifier');
var MatrixToolbar = ComponentBroker.get('molecules/MatrixToolbar');
var RoomViewController = require("../../../../src/controllers/organisms/RoomView");
var Loader = require("react-loader");
@ -142,8 +143,14 @@ module.exports = React.createClass({
roomEdit = <Loader/>;
}
var top_bar;
if (!Notifier.isEnabled()) {
top_bar = <MatrixToolbar />;
}
return (
<div className="mx_RoomView">
{top_bar}
<RoomHeader ref="header" room={this.state.room} editing={this.state.editingRoomSettings}
onSettingsClick={this.onSettingsClick} onSaveClick={this.onSaveClick}/>
<div className="mx_RoomView_auxPanel">