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

fix text and map indent in thread view #8462

Merged
merged 3 commits into from
May 3, 2022
Merged

fix text and map indent in thread view #8462

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd1c09e
fix message indent in thread view
May 2, 2022
093a36f
Merge branch 'develop' into kerry/fix/21997/map-thread-display
May 2, 2022
b9ee1a3
Merge branch 'develop' into kerry/fix/21997/map-thread-display
t3chguy May 3, 2022
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
1 change: 0 additions & 1 deletion res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
width: 100%;

.mx_EventTile_content,
.mx_EventTile_body,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added here: https://github.com/matrix-org/matrix-react-sdk/pull/8442/files#diff-bd83194d78de871bc4ad1c4e8d43102c4368481bbb90705152d3d17fea813919R892

.mx_HiddenBody,
.mx_RedactedBody,
.mx_UnknownBody,
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/messages/MLocationBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const LocationBodyFallbackContent: React.FC<{ event: MatrixEvent, error:
(_t('Shared their location: ') + event.getContent()?.body) :
(_t('Shared a location: ') + event.getContent()?.body);

return <div className="mx_EventTile_body">
return <div className="mx_EventTile_body mx_MLocationBody">
<span className={errorType !== LocationShareError.MapStyleUrlNotConfigured ? "mx_EventTile_tileError" : ''}>
{ message }
</span>
Expand Down
4 changes: 2 additions & 2 deletions test/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`MLocationBody <MLocationBody> with error displays correct fallback content when map_style_url is misconfigured 1`] = `
<div
className="mx_EventTile_body"
className="mx_EventTile_body mx_MLocationBody"
>
<span
className="mx_EventTile_tileError"
Expand All @@ -16,7 +16,7 @@ exports[`MLocationBody <MLocationBody> with error displays correct fallback cont

exports[`MLocationBody <MLocationBody> with error displays correct fallback content without error style when map_style_url is not configured 1`] = `
<div
className="mx_EventTile_body"
className="mx_EventTile_body mx_MLocationBody"
>
<span
className=""
Expand Down