Merge pull request #1744 from matrix-org/luke/move-groups-button-tp

Move groups button to TagPanel
pull/21833/head
David Baker 2018-02-13 11:00:49 +01:00 committed by GitHub
commit 03921bad79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions

View File

@ -111,8 +111,7 @@ const TagPanel = React.createClass({
}, },
render() { render() {
const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); const GroupsButton = sdk.getComponent('elements.GroupsButton');
const TintableSvg = sdk.getComponent('elements.TintableSvg');
const DNDTagTile = sdk.getComponent('elements.DNDTagTile'); const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
const tags = this.state.orderedTags.map((tag, index) => { const tags = this.state.orderedTags.map((tag, index) => {
@ -142,9 +141,9 @@ const TagPanel = React.createClass({
) } ) }
</Droppable> </Droppable>
</DragDropContext> </DragDropContext>
<AccessibleButton className="mx_TagPanel_createGroupButton" onClick={this.onCreateGroupClick}> <div className="mx_TagPanel_createGroupButton">
<TintableSvg src="img/icons-create-room.svg" width="25" height="25" /> <GroupsButton tooltip={true} />
</AccessibleButton> </div>
</div>; </div>;
}, },
}); });