diff options
| -rw-r--r-- | app/javascript/mastodon/components/status_content.js | 1 | ||||
| -rw-r--r-- | app/javascript/styles/components.scss | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js index fd9aa7edc..3b8155632 100644 --- a/app/javascript/mastodon/components/status_content.js +++ b/app/javascript/mastodon/components/status_content.js @@ -122,6 +122,7 @@ export default class StatusContent extends React.PureComponent { const directionStyle = { direction: 'ltr' }; const classNames = classnames('status__content', { 'status__content--with-action': this.props.onClick && this.context.router, + 'status__content--with-spoiler': status.get('spoiler_text').length > 0, }); if (isRtl(status.get('search_index'))) { diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index b6da70c91..5211489f7 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -511,6 +511,14 @@ overflow: hidden; white-space: pre-wrap; + &.status__content--with-spoiler { + white-space: normal; + + .status__content__text { + white-space: pre-wrap; + } + } + .emojione { width: 18px; height: 18px; |