浏览代码

Hide sensitive image in default on the public pages (#5009)

Additionally, this restores previous background / text color for media spoiler.
master
unarist 6 年前
committed by Eugen Rochko
父节点
当前提交
4aea3f88a6
共有 3 个文件被更改,包括 15 次插入2 次删除
  1. +13
    -0
      app/javascript/styles/stream_entries.scss
  2. +1
    -1
      app/views/stream_entries/_detailed_status.html.haml
  3. +1
    -1
      app/views/stream_entries/_simple_status.html.haml

+ 13
- 0
app/javascript/styles/stream_entries.scss 查看文件

@@ -243,6 +243,19 @@
}
}

.media-spoiler {
background: $ui-primary-color;
color: $white;
transition: all 100ms linear;

&:hover,
&:active,
&:focus {
background: darken($ui-primary-color, 5%);
color: unset;
}
}

.pre-header {
padding: 14px 0;
padding-left: (48px + 14px * 2);


+ 1
- 1
app/views/stream_entries/_detailed_status.html.haml 查看文件

@@ -24,7 +24,7 @@
- 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) }}
- else
%div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}
%div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}
- elsif status.preview_cards.first
%div{ data: { component: 'Card', props: Oj.dump('maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json) }}



+ 1
- 1
app/views/stream_entries/_simple_status.html.haml 查看文件

@@ -25,4 +25,4 @@
- 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: 610, height: 343) }}
- else
%div{ data: { component: 'MediaGallery', props: Oj.dump(height: 343, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}
%div{ data: { component: 'MediaGallery', props: Oj.dump(height: 343, sensitive: status.sensitive?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}

正在加载...
取消
保存