Browse Source

Fix unwanted content warning gap in CSS (#5436)

Fix #5356
master
Eugen Rochko 7 years ago
committed by GitHub
parent
commit
05686cc99d
2 changed files with 9 additions and 0 deletions
  1. +1
    -0
      app/javascript/mastodon/components/status_content.js
  2. +8
    -0
      app/javascript/styles/components.scss

+ 1
- 0
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 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'))) {

+ 8
- 0
app/javascript/styles/components.scss View File

@ -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;

Loading…
Cancel
Save