3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unwanted content warning gap in CSS (#5436) 

Fix #5356
signup-info-prompt
Eugen Rochko 2017-10-17 20:07:44 +02:00 committed by GitHub
parent 484208ce12
commit 05686cc99d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/mastodon/components/status_content.js
View File

@ -122,6 +122,7 @@ export default class StatusContent extends React.PureComponent {
const directionStyle = { direction: 'ltr' }; const directionStyle = { direction: 'ltr' };
const classNames = classnames('status__content', { const classNames = classnames('status__content', {
'status__content--with-action': this.props.onClick && this.context.router, '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'))) { if (isRtl(status.get('search_index'))) {

8
app/javascript/styles/components.scss
View File

@ -511,6 +511,14 @@
overflow: hidden; overflow: hidden;
white-space: pre-wrap; white-space: pre-wrap;
&.status__content--with-spoiler {
white-space: normal;
.status__content__text {
white-space: pre-wrap;
}
}
.emojione { .emojione {
width: 18px; width: 18px;
height: 18px; height: 18px;