Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
6583befa76
1 changed files with 1 additions and 3 deletions
|
@ -125,9 +125,7 @@ export default React.createClass({
|
||||||
|
|
||||||
const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;
|
const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;
|
||||||
|
|
||||||
const nameClasses = classNames({
|
const nameClasses = classNames('mx_RoomTile_name mx_RoomTile_invite mx_RoomTile_badgeShown', {
|
||||||
'mx_RoomTile_name': true,
|
|
||||||
'mx_RoomTile_invite': this.props.isInvite,
|
|
||||||
'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed,
|
'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue