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

matrix-org · Oct 30, 2018 · e80a1c5 · e80a1c5
1 parent 4972b1b
commit e80a1c5
Show file tree

Hide file tree

Showing 8 changed files with 377 additions and 240 deletions.
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
@@ -20,7 +20,6 @@ limitations under the License.
     border-bottom: 1px solid $primary-hairline-color;
 }
 
-
 /* add 20px to the height of the header when editing */
 .mx_RoomHeader_editing {
     flex: 0 0 93px ! important;

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
@@ -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() }