diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-16 15:26:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 15:26:50 +0100 |
| commit | 396c5dea87f259255f3676bb7b30f5cfdfec9d4e (patch) | |
| tree | 33c64f250983b0d8c07bad2a0ec970539e78b1d6 /app/views/accounts/_header.html.haml | |
| parent | f0505a5b2e727da73c8aa651b804508a8187a3c4 (diff) | |
| parent | 7238e4ea5f4f619396f73009032844d95bdf809c (diff) | |
Merge pull request #856 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/accounts/_header.html.haml')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 9ceae007d..370e7e470 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -1,12 +1,9 @@ .public-account-header{:class => ("inactive" if account.moved?)} .public-account-header__image - = image_tag account.header.url, class: 'parallax' + = image_tag (current_account&.user&.setting_auto_play_gif ? account.header_original_url : account.header_static_url), class: 'parallax' .public-account-header__bar = link_to short_account_url(account), class: 'avatar' do - - if current_account&.user&.setting_auto_play_gif - = image_tag account.avatar_original_url - - else - = image_tag account.avatar_static_url + = image_tag (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url) .public-account-header__tabs .public-account-header__tabs__name %h1 |