1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-27 04:21:52 +03:00

move room/group panel header buttons into room/group header

This commit is contained in:
Bruno Windels
2018-10-30 17:15:19 +01:00
parent 4972b1ba7c
commit e80a1c5051
8 changed files with 379 additions and 242 deletions

View File

@ -24,6 +24,7 @@ import dis from '../../dispatcher';
import { sanitizedHtmlNode } from '../../HtmlUtils';
import { _t, _td } from '../../languageHandler';
import AccessibleButton from '../views/elements/AccessibleButton';
import GroupHeaderButtons from '../views/right_panel/GroupHeaderButtons';
import Modal from '../../Modal';
import classnames from 'classnames';
@ -1305,6 +1306,7 @@ export default React.createClass({
<div className="mx_GroupView_header_rightCol">
{ rightButtons }
</div>
<GroupHeaderButtons />
</div>
<GeminiScrollbarWrapper className="mx_GroupView_body">
{ this._getMembershipSection() }