mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 23:31:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-02-13 10:00:56 +00:00
commit d28d7d8768
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/TagPanel.js
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>;
}, },
}); });