diff options
| author | shel <Yiskah.Raphen@gmail.com> | 2017-03-31 10:34:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 10:34:14 -0400 |
| commit | f20f6b25b98efffca47caae713f8dc5e1d0d4bd1 (patch) | |
| tree | 104152d4bd6f9889f38b2f46fee108185c3b29f7 /app/views/stream_entries/_simple_status.html.haml | |
| parent | 76188d61f2c3bb5747208df92835e912db18d7b6 (diff) | |
| parent | 680f9efe9c4aa7fce1f4dd6a35ef4aca7a80c1f3 (diff) | |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/views/stream_entries/_simple_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index cb2c976ce..2eb9bf166 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -14,8 +14,10 @@ .status__content.e-content.p-name.emojify< - unless status.spoiler_text.blank? - %p= status.spoiler_text - %div{ style: "direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) + %p{ style: 'margin-bottom: 0' }< + %span>= "#{status.spoiler_text} " + %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') + %div{ style: "display: #{status.spoiler_text.blank? ? 'block' : 'none'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) - unless status.media_attachments.empty? .status__attachments |