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

Fix blurhash rounded corners missing regression #6467

Merged
merged 2 commits into from
Jul 23, 2021
Merged

Fix blurhash rounded corners missing regression #6467

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
5f25823
Fix blurhash rounded corners missing regression
t3chguy Jul 23, 2021
4fe0e21
Use div instead of span for mx_MImageBody to not violate spec
t3chguy Jul 23, 2021
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
6 changes: 1 addition & 5 deletions res/css/views/messages/_MImageBody.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ limitations under the License.

$timelineImageBorderRadius: 4px;

.mx_MImageBody {
display: block;
}

.mx_MImageBody_thumbnail {
object-fit: contain;
border-radius: $timelineImageBorderRadius;
Expand All @@ -28,7 +24,7 @@ $timelineImageBorderRadius: 4px;
justify-content: center;
align-items: center;

> canvas {
> div > canvas {
border-radius: $timelineImageBorderRadius;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/views/messages/MImageBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,10 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {

if (this.state.error !== null) {
return (
<span className="mx_MImageBody">
<div className="mx_MImageBody">
<img src={require("../../../../res/img/warning.svg")} width="16" height="16" />
{ _t("Error decrypting image") }
</span>
</div>
);
}

Expand All @@ -434,10 +434,10 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
const thumbnail = this.messageContent(contentUrl, thumbUrl, content);
const fileBody = this.getFileBody();

return <span className="mx_MImageBody">
return <div className="mx_MImageBody">
{ thumbnail }
{ fileBody }
</span>;
</div>;
}
}

Expand Down