mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

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

Browse source
This commit is contained in:
Matthew Hodgson 2017-11-10 15:29:37 -08:00
commit 47d9e7f2a1
18 changed files with 419 additions and 60 deletions
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 SettingsButton = sdk.getComponent('elements.SettingsButton');
const groupsButton = UserSettingsStore.isFeatureEnabled('feature_groups') ?
<GroupsButton tooltip={true} /> : null;
return (
<div className="mx_BottomLeftMenu">
<div className="mx_BottomLeftMenu_options">
@ -186,12 +183,12 @@ module.exports = React.createClass({
<div ref={this._collectCreateRoomButton}>
<CreateRoomButton tooltip={true} />
</div>
{ groupsButton }
<GroupsButton tooltip={true} />
<span className="mx_BottomLeftMenu_settings">
<SettingsButton tooltip={true} />
</span>
</div>
</div>
);
}
},
});