gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into release-v0.13.0

This commit is contained in:
Luke Barnard 2017-11-10 16:50:11 +00:00
parent 5c9dd17d21 73e7581fc6
commit 718f48ba04
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/BottomLeftMenu.js
View File

@ -170,9 +170,6 @@ module.exports = React.createClass({
const GroupsButton = sdk.getComponent('elements.GroupsButton'); const GroupsButton = sdk.getComponent('elements.GroupsButton');
const SettingsButton = sdk.getComponent('elements.SettingsButton'); const SettingsButton = sdk.getComponent('elements.SettingsButton');
const groupsButton = UserSettingsStore.isFeatureEnabled('feature_groups') ?
<GroupsButton tooltip={true} /> : null;
return ( return (
<div className="mx_BottomLeftMenu"> <div className="mx_BottomLeftMenu">
<div className="mx_BottomLeftMenu_options"> <div className="mx_BottomLeftMenu_options">
@ -186,12 +183,12 @@ module.exports = React.createClass({
<div ref={this._collectCreateRoomButton}> <div ref={this._collectCreateRoomButton}>
<CreateRoomButton tooltip={true} /> <CreateRoomButton tooltip={true} />
</div> </div>
{ groupsButton } <GroupsButton tooltip={true} />
<span className="mx_BottomLeftMenu_settings"> <span className="mx_BottomLeftMenu_settings">
<SettingsButton tooltip={true} /> <SettingsButton tooltip={true} />
</span> </span>
</div> </div>
</div> </div>
); );
} },
}); });