Improve Activity stream spoiler (#4088)
This commit is contained in:
parent
b03812ef19
commit
a4615ad12a
5 changed files with 28 additions and 11 deletions
|
@ -53,8 +53,12 @@ function main() {
|
|||
}
|
||||
});
|
||||
|
||||
delegate(document, '.media-spoiler', 'click', ({ target }) => {
|
||||
target.style.display = 'none';
|
||||
delegate(document, '.activity-stream .media-spoiler-wrapper .media-spoiler', 'click', function() {
|
||||
this.parentNode.classList.add('media-spoiler-wrapper__visible');
|
||||
});
|
||||
|
||||
delegate(document, '.activity-stream .media-spoiler-wrapper .spoiler-button', 'click', function() {
|
||||
this.parentNode.classList.remove('media-spoiler-wrapper__visible');
|
||||
});
|
||||
|
||||
delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
|
||||
|
|
|
@ -330,6 +330,18 @@
|
|||
}
|
||||
}
|
||||
|
||||
.media-spoiler-wrapper {
|
||||
&.media-spoiler-wrapper__visible {
|
||||
.media-spoiler {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.spoiler-button {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.pre-header {
|
||||
padding: 14px 0;
|
||||
padding-left: (48px + 14px * 2);
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -17,13 +17,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 }
|
||||
|
|
|
@ -22,8 +22,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
|
||||
|
|
Loading…
Reference in a new issue