Procházet zdrojové kódy

Fix #700 - hide spoilers on static pages

master
Eugen Rochko před 7 roky
rodič
revize
5e26295e06
5 změnil soubory, kde provedl 40 přidání a 4 odebrání
  1. +13
    -0
      app/assets/javascripts/extras.jsx
  2. +18
    -0
      app/assets/stylesheets/stream_entries.scss
  3. +4
    -2
      app/views/stream_entries/_detailed_status.html.haml
  4. +4
    -2
      app/views/stream_entries/_simple_status.html.haml
  5. +1
    -0
      config/locales/en.yml

+ 13
- 0
app/assets/javascripts/extras.jsx Zobrazit soubor

@@ -24,4 +24,17 @@ $(() => {
window.location.href = $(e.target).attr('href');
}
});

$('.status__content__spoiler-link').on('click', e => {
e.preventDefault();
const contentEl = $(e.target).parent().parent().find('div');

if (contentEl.is(':visible')) {
contentEl.hide();
$(e.target).parent().attr('style', 'margin-bottom: 0');
} else {
contentEl.show();
$(e.target).parent().attr('style', null);
}
});
});

+ 18
- 0
app/assets/stylesheets/stream_entries.scss Zobrazit soubor

@@ -97,6 +97,15 @@
a {
color: $color4;
}

a.status__content__spoiler-link {
color: $color5;
background: $color3;

&:hover {
background: lighten($color3, 8%);
}
}
}

.status__attachments {
@@ -163,6 +172,15 @@
a {
color: $color4;
}

a.status__content__spoiler-link {
color: $color5;
background: $color3;

&:hover {
background: lighten($color3, 8%);
}
}
}

.detailed-status__meta {


+ 4
- 2
app/views/stream_entries/_detailed_status.html.haml Zobrazit soubor

@@ -9,8 +9,10 @@

.status__content.e-content.p-name.emojify<
- unless status.spoiler_text.blank?
%p= status.spoiler_text
%div{ style: "direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status)
%p{ style: 'margin-bottom: 0' }<
%span>= "#{status.spoiler_text} "
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
%div{ style: "display: #{status.spoiler_text.blank? ? 'block' : 'none'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status)

- unless status.media_attachments.empty?
- if status.media_attachments.first.video?


+ 4
- 2
app/views/stream_entries/_simple_status.html.haml Zobrazit soubor

@@ -14,8 +14,10 @@

.status__content.e-content.p-name.emojify<
- unless status.spoiler_text.blank?
%p= status.spoiler_text
%div{ style: "direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status)
%p{ style: 'margin-bottom: 0' }<
%span>= "#{status.spoiler_text} "
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
%div{ style: "display: #{status.spoiler_text.blank? ? 'block' : 'none'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status)

- unless status.media_attachments.empty?
.status__attachments


+ 1
- 0
config/locales/en.yml Zobrazit soubor

@@ -138,6 +138,7 @@ en:
statuses:
open_in_web: Open in web
over_character_limit: character limit of %{max} exceeded
show_more: Show more
visibilities:
private: Only show to followers
public: Public


Načítá se…
Zrušit
Uložit