diff options
| author | ThibG <thib@sitedethib.com> | 2018-09-01 17:44:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 17:44:06 +0200 |
| commit | 2b82829a5351855bbf8dccdb57c8f7dbd598b6bb (patch) | |
| tree | b3754c8ac02614e821c6680cf31ecb64389aca36 /app/views | |
| parent | cc7adf7e842b662fafc1eb1a9de3b7a450abbd1a (diff) | |
| parent | a74a7d5fe30dad5e2e4a3ac5e199ce18db75fe59 (diff) | |
Merge pull request #699 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 4 | ||||
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index bf5f614a1..d0d9cc5fc 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -2,9 +2,9 @@ = link_to TagManager.instance.url_for(status.account), class: 'detailed-status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do .detailed-status__display-avatar - if current_account&.user&.setting_auto_play_gif || autoplay - = image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'account__avatar u-photo' + = image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'account__avatar u-photo' - else - = image_tag status.account.avatar.url(:static), width: 48, height: 48, alt: '', class: 'account__avatar u-photo' + = image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar u-photo' %span.display-name %bdi %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay) diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 7b7d71602..4484a7e62 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -8,9 +8,9 @@ .status__avatar %div - if current_account&.user&.setting_auto_play_gif || autoplay - = image_tag status.account.avatar(:original), width: 48, height: 48, alt: '', class: 'u-photo account__avatar' + = image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar' - else - = image_tag status.account.avatar(:static), width: 48, height: 48, alt: '', class: 'u-photo account__avatar' + = image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar' %span.display-name %bdi %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay) |