logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 05686cc99d409739ae470e2c2b00796f413ae40b
parent: 484208ce12402d8b82070038d9be8441b82f86e7
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 17 Oct 2017 20:07:44 +0200

Fix unwanted content warning gap in CSS (#5436)

Fix #5356

Diffstat:

Mapp/javascript/mastodon/components/status_content.js1+
Mapp/javascript/styles/components.scss8++++++++
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 @@ -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 @@ -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;