OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4880 from matrix-org/travis/room-list/fix-elongation 

Don't include empty badge container in minimized view
pull/21833/head
Travis Ralston 2020-07-02 14:38:56 -06:00 committed by GitHub
parent e013597e26 0d9ce0721f
commit 420f3fdbc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/views/rooms/RoomTile2.tsx
View File

@ -369,11 +369,15 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
let badge: React.ReactNode;
if (!this.props.isMinimized) {
badge = <NotificationBadge
notification={this.state.notificationState}
forceCount={false}
roomId={this.props.room.roomId}
/>;
badge = (
<div className="mx_RoomTile2_badgeContainer">
<NotificationBadge
notification={this.state.notificationState}
forceCount={false}
roomId={this.props.room.roomId}
/>
</div>
);
}
// TODO: the original RoomTile uses state for the room name. Do we need to?
@ -429,9 +433,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
>
{roomAvatar}
{nameContainer}
<div className="mx_RoomTile2_badgeContainer">
{badge}
</div>
{badge}
{this.renderNotificationsMenu()}
{this.renderGeneralMenu()}
</AccessibleButton>