diff options
| author | Reverite <github@reverite.sh> | 2019-09-07 13:03:02 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-07 13:03:02 -0700 |
| commit | 2486f5f825ae861cdf97529f64dc4e658ddab279 (patch) | |
| tree | eebbd191c621baa43a93b26d97d4766cf7ebf9cd /app/views/application | |
| parent | 54bf56d9e019e29c1509a2c5a0f23e4f1df65c90 (diff) | |
| parent | 286bf110c3e69042049968440f1eb99372a7e0e6 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/views/application')
| -rw-r--r-- | app/views/application/_card.html.haml | 2 | ||||
| -rw-r--r-- | app/views/application/_sidebar.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml index 00254c40c..8719ce484 100644 --- a/app/views/application/_card.html.haml +++ b/app/views/application/_card.html.haml @@ -9,7 +9,7 @@ = image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo' .display-name - %span{id: "default_account_display_name", style: "display:none;"}= account.username + %span{ id: "default_account_display_name", style: "display: none" }= account.username %bdi %strong.emojify.p-name= display_name(account, custom_emojify: true) %span diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml index 90c8f9dd1..33e7c96fe 100644 --- a/app/views/application/_sidebar.html.haml +++ b/app/views/application/_sidebar.html.haml @@ -5,7 +5,7 @@ .hero-widget__text %p= @instance_presenter.site_short_description.html_safe.presence || @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) -- if Setting.trends +- if Setting.trends && !(user_signed_in? && !current_user.setting_trends) - trends = TrendingTags.get(3) - unless trends.empty? |