diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-03 17:21:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 17:21:33 +0200 |
| commit | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (patch) | |
| tree | 686c30ed5f6c4cfe5f6b4d84e46ff19f7baa6949 /app/helpers | |
| parent | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff) | |
| parent | 7b15f4006adb5f8f04d83174532c30eeb78757b0 (diff) | |
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/accounts_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/home_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index e15aee6df..91c3a116b 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -28,7 +28,7 @@ module AccountsHelper end def hide_followers_count?(account) - Setting.hide_followers_count || account.user&.setting_hide_followers_count + Setting.hide_followers_count || account.user&.settings['hide_followers_count'] end def account_description(account) diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb index ea2196086..c5b83326d 100644 --- a/app/helpers/home_helper.rb +++ b/app/helpers/home_helper.rb @@ -8,7 +8,7 @@ module HomeHelper end def account_link_to(account, button = '', path: nil) - content_tag(:div, class: 'account') do + content_tag(:div, class: 'account account--minimal') do content_tag(:div, class: 'account__wrapper') do section = if account.nil? content_tag(:div, class: 'account__display-name') do |