diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-11 22:28:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 22:28:11 +0200 |
| commit | ef925f31a66d1cbc95bff11669d05e2924d8ce85 (patch) | |
| tree | aadbb60d22a196075fe1faaeeae169e5badead57 /app/views/statuses/_detailed_status.html.haml | |
| parent | b3dd0d276d52042828e11bf325015f5d7f4624ca (diff) | |
| parent | 877e8c9d799eae663526609642e0c0c9a4612bda (diff) | |
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/statuses/_detailed_status.html.haml')
| -rw-r--r-- | app/views/statuses/_detailed_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml index 12f03ccdd..5cee84ada 100644 --- a/app/views/statuses/_detailed_status.html.haml +++ b/app/views/statuses/_detailed_status.html.haml @@ -20,7 +20,7 @@ %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }< %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)} %button.status__content__spoiler-link= t('statuses.show_more') - .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" } + .e-content{ style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" } = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay) - if status.preloadable_poll = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do |