Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit 60aef13

Browse files
committed
Rename event tile badges
1 parent 81a4cdc commit 60aef13

File tree

3 files changed

+29
-21
lines changed

3 files changed

+29
-21
lines changed

res/css/views/rooms/_EventBubbleTile.pcss

+3-3
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ Please see LICENSE files in the repository root for full details.
172172
border-color: $quinary-content;
173173
}
174174

175-
.mx_EventTile_badges {
175+
.mx_EventTile_footer {
176176
margin: var(--cpd-space-1-5x) 0;
177177
margin-inline: var(--EventTile_bubble_line-margin-inline-start) var(--EventTile_bubble_line-margin-inline-end);
178178
}
@@ -206,7 +206,7 @@ Please see LICENSE files in the repository root for full details.
206206
}
207207

208208
.mx_ReactionsRow,
209-
.mx_EventTile_badges {
209+
.mx_EventTile_footer {
210210
justify-content: flex-start;
211211
}
212212

@@ -247,7 +247,7 @@ Please see LICENSE files in the repository root for full details.
247247
max-width: 100%;
248248
}
249249

250-
.mx_EventTile_badges {
250+
.mx_EventTile_footer {
251251
justify-content: flex-end;
252252
}
253253

res/css/views/rooms/_EventTile.pcss

+4-4
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ $left-gutter: 64px;
513513
margin-left: $left-gutter;
514514
}
515515

516-
.mx_EventTile_badges {
516+
.mx_EventTile_footer {
517517
margin: var(--cpd-space-1x) var(--cpd-space-16x);
518518
}
519519

@@ -1252,7 +1252,7 @@ $left-gutter: 64px;
12521252
padding-block-start: $spacing-16;
12531253

12541254
.mx_EventTile_line,
1255-
.mx_EventTile_badges {
1255+
.mx_EventTile_footer {
12561256
margin-inline-end: var(--ThreadView_group_spacing-end);
12571257
}
12581258

@@ -1270,7 +1270,7 @@ $left-gutter: 64px;
12701270
}
12711271
}
12721272

1273-
.mx_EventTile_badges {
1273+
.mx_EventTile_footer {
12741274
/* Align with message text and summary text */
12751275
margin-inline-start: var(--ThreadView_group_spacing-start);
12761276
}
@@ -1460,7 +1460,7 @@ $left-gutter: 64px;
14601460
display: flex;
14611461
}
14621462

1463-
.mx_EventTile_badges {
1463+
.mx_EventTile_footer {
14641464
display: flex;
14651465
gap: var(--cpd-space-2x);
14661466
align-items: center;

src/components/views/rooms/EventTile.tsx

+22-14
Original file line numberDiff line numberDiff line change
@@ -1141,6 +1141,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
11411141
);
11421142
}
11431143

1144+
const hasFooter = Boolean(reactionsRow || pinnedMessageBadge);
1145+
11441146
const linkedTimestamp = !this.props.hideTimestamp ? (
11451147
<a
11461148
href={permalink}
@@ -1246,11 +1248,13 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
12461248
</a>
12471249
{msgOption}
12481250
</div>,
1249-
<div className="mx_EventTile_badges" key="mx_EventTile_badges">
1250-
{(this.props.layout === Layout.Group || !isOwnEvent) && pinnedMessageBadge}
1251-
{reactionsRow}
1252-
{this.props.layout === Layout.Bubble && isOwnEvent && pinnedMessageBadge}
1253-
</div>,
1251+
hasFooter && (
1252+
<div className="mx_EventTile_footer" key="mx_EventTile_footer">
1253+
{(this.props.layout === Layout.Group || !isOwnEvent) && pinnedMessageBadge}
1254+
{reactionsRow}
1255+
{this.props.layout === Layout.Bubble && isOwnEvent && pinnedMessageBadge}
1256+
</div>
1257+
),
12541258
],
12551259
);
12561260
}
@@ -1439,21 +1443,25 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
14391443
{actionBar}
14401444
{this.props.layout === Layout.IRC && (
14411445
<>
1442-
<div className="mx_EventTile_badges">
1443-
{pinnedMessageBadge}
1444-
{reactionsRow}
1445-
</div>
1446+
{hasFooter && (
1447+
<div className="mx_EventTile_footer">
1448+
{pinnedMessageBadge}
1449+
{reactionsRow}
1450+
</div>
1451+
)}
14461452
{this.renderThreadInfo()}
14471453
</>
14481454
)}
14491455
</div>
14501456
{this.props.layout !== Layout.IRC && (
14511457
<>
1452-
<div className="mx_EventTile_badges">
1453-
{(this.props.layout === Layout.Group || !isOwnEvent) && pinnedMessageBadge}
1454-
{reactionsRow}
1455-
{this.props.layout === Layout.Bubble && isOwnEvent && pinnedMessageBadge}
1456-
</div>
1458+
{hasFooter && (
1459+
<div className="mx_EventTile_footer">
1460+
{(this.props.layout === Layout.Group || !isOwnEvent) && pinnedMessageBadge}
1461+
{reactionsRow}
1462+
{this.props.layout === Layout.Bubble && isOwnEvent && pinnedMessageBadge}
1463+
</div>
1464+
)}
14571465
{this.renderThreadInfo()}
14581466
</>
14591467
)}

0 commit comments

Comments
 (0)