diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-09 00:55:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-09 00:55:58 +0100 |
commit | 70ce2a20956347b42f0b55cfcde42b6e83aee400 (patch) | |
tree | 68499f6fc0552553079af958dbc7793a2be1702c /app/views/stream_entries | |
parent | b0db4dad79dac4d9d339e09c62d5aaae9e56c861 (diff) |
Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)
Diffstat (limited to 'app/views/stream_entries')
-rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 3119ebf4b..94e081c84 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -22,7 +22,7 @@ - if !status.media_attachments.empty? - if status.media_attachments.first.video? - video = status.media_attachments.first - %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380) }} + %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380, detailed: true) }} - else %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }} - elsif status.preview_cards.first |