diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 4442ab4951..e35b1fd5fd 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -191,7 +191,9 @@ export default class Card extends React.PureComponent {
this.setState({ previewLoaded: true });
}
- handleReveal = () => {
+ handleReveal = e => {
+ e.preventDefault();
+ e.stopPropagation();
this.setState({ revealed: true });
}
@@ -279,7 +281,7 @@ export default class Card extends React.PureComponent {
}
return (
-
+
{embed}
{!compact && description}
@@ -289,14 +291,12 @@ export default class Card extends React.PureComponent {
{canvas}
{thumbnail}
- {!revealed && spoilerButton}
);
} else {
embed = (
- {!revealed && spoilerButton}
);
}
@@ -305,6 +305,7 @@ export default class Card extends React.PureComponent {
{embed}
{description}
+ {!revealed && spoilerButton}
);
}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index fb9dca41b4..2ff9073db1 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3003,6 +3003,7 @@ a.account__display-name {
}
.status-card {
+ position: relative;
display: flex;
font-size: 14px;
border: 1px solid lighten($ui-base-color, 8%);