Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

TAC: Fix CSS & component typos #12333

Merged
merged 2 commits into from
Mar 11, 2024
Merged

TAC: Fix CSS & component typos #12333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9e1bd2
Fix CSS & component typo
florianduros Mar 11, 2024
e34d53a
Update snapshots
florianduros Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions res/css/structures/_ThreadsActivityCentre.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
}
}

.mx_ThreadsActivity_rows {
.mx_ThreadsActivityCentre_rows {
overflow-y: scroll;
/* Let some space at the top and the bottom of the pop-up */
max-height: calc(100vh - 200px);

.mx_ThreadsActivityRow {
.mx_ThreadsActivityCentreRow {
height: 48px;

/* Make the label of the MenuItem stay on one line and truncate with ellipsis if needed */
Expand Down
8 changes: 4 additions & 4 deletions src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCen
}
>
{/* Make the content of the pop-up scrollable */}
<div className="mx_ThreadsActivity_rows">
<div className="mx_ThreadsActivityCentre_rows">
{roomsAndNotifications.rooms.map(({ room, notificationLevel }) => (
<ThreadsActivityRow
<ThreadsActivityCentreRow
key={room.roomId}
room={room}
notificationLevel={notificationLevel}
Expand Down Expand Up @@ -122,10 +122,10 @@ interface ThreadsActivityRow {
/**
* Display a room with unread threads.
*/
function ThreadsActivityRow({ room, onClick, notificationLevel }: ThreadsActivityRow): JSX.Element {
function ThreadsActivityCentreRow({ room, onClick, notificationLevel }: ThreadsActivityRow): JSX.Element {
return (
<MenuItem
className="mx_ThreadsActivityRow"
className="mx_ThreadsActivityCentreRow"
onSelect={(event: Event) => {
onClick();

Expand Down
8 changes: 4 additions & 4 deletions test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
Threads activity
</h3>
<div
class="mx_ThreadsActivity_rows"
class="mx_ThreadsActivityCentre_rows"
>
<button
class="mx_ThreadsActivityRow _item_1gwvj_17 _interactive_1gwvj_36"
class="mx_ThreadsActivityCentreRow _item_1gwvj_17 _interactive_1gwvj_36"
data-kind="primary"
data-orientation="vertical"
data-radix-collection-item=""
Expand Down Expand Up @@ -74,7 +74,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
</div>
</button>
<button
class="mx_ThreadsActivityRow _item_1gwvj_17 _interactive_1gwvj_36"
class="mx_ThreadsActivityCentreRow _item_1gwvj_17 _interactive_1gwvj_36"
data-kind="primary"
data-orientation="vertical"
data-radix-collection-item=""
Expand Down Expand Up @@ -148,7 +148,7 @@ exports[`ThreadsActivityCentre should match snapshot when empty 1`] = `
Threads activity
</h3>
<div
class="mx_ThreadsActivity_rows"
class="mx_ThreadsActivityCentre_rows"
>
<div
class="mx_ThreadsActivityCentre_emptyCaption"
Expand Down
Loading