Merge upstream!! #64 <3 <3

app/views/stream_entries/_content_spoiler.html.haml

@@ -1,3 +1,7 @@
-.media-spoiler><
-  %span= t('stream_entries.sensitive_content')
-  %span= t('stream_entries.click_to_show')
+.media-spoiler-wrapper{ class: sensitive == false && 'media-spoiler-wrapper__visible' }><
+  .spoiler-button
+    .icon-button.overlayed
+      %i.fa.fa-fw.fa-eye
+  .media-spoiler
+    %span= t('stream_entries.sensitive_content')
+    %span= t('stream_entries.click_to_show')

app/views/stream_entries/_detailed_status.html.haml

@@ -18,13 +18,11 @@
       - unless status.media_attachments.empty?
         - if status.media_attachments.first.video?
           .video-player><
-            - if status.sensitive?
-              = render partial: 'stream_entries/content_spoiler'
+            = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
             %video.u-video{ src: status.media_attachments.first.file.url(:original), loop: true }
         - else
           .detailed-status__attachments><
-            - if status.sensitive?
-              = render partial: 'stream_entries/content_spoiler'
+            = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
             .status__attachments__inner<
               - status.media_attachments.each do |media|
                 = render partial: 'stream_entries/media', locals: { media: media }

app/views/stream_entries/_simple_status.html.haml

@@ -23,8 +23,7 @@
 
       - unless status.media_attachments.empty?
         .status__attachments><
-          - if status.sensitive?
-            = render partial: 'stream_entries/content_spoiler'
+          = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
           - if status.media_attachments.first.video?
             .status__attachments__inner<
               .video-item<