diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 18:21:59 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 18:21:59 +0200 |
| commit | 50b430d9a2857edf8ab44e9b94c7bcb14ecd2117 (patch) | |
| tree | 4932ca1d8e52f6ce9b8b9fbb304b6bfce4027e54 /app/views/accounts | |
| parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
| parent | d8e0c8a89e1f1dd1c4ce1513deaeb3c85c6e4a42 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 52fb0d946..76dec18b1 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -1,9 +1,9 @@ .public-account-header{:class => ("inactive" if account.moved?)} .public-account-header__image - = image_tag (current_account&.user&.setting_auto_play_gif ? account.header_original_url : account.header_static_url), class: 'parallax' + = image_tag (prefers_autoplay? ? account.header_original_url : account.header_static_url), class: 'parallax' .public-account-header__bar = link_to short_account_url(account), class: 'avatar' do - = image_tag (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), id: 'profile_page_avatar', data: {original: full_asset_url(account.avatar_original_url), static: full_asset_url(account.avatar_static_url), autoplay: current_account&.user&.setting_auto_play_gif} + = image_tag (prefers_autoplay? ? account.avatar_original_url : account.avatar_static_url), id: 'profile_page_avatar', data: { original: full_asset_url(account.avatar_original_url), static: full_asset_url(account.avatar_static_url), autoplay: prefers_autoplay? } .public-account-header__tabs .public-account-header__tabs__name %h1 |