mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge branch 'develop' into release-v0.13.0
This commit is contained in:
commit
718f48ba04
@ -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>
|
||||||
);
|
);
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user