diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
| commit | d17844e6d1ad700df0f704972e2ce16e8693d33b (patch) | |
| tree | ada49442558fb14c6cf97e79fb6e2dcaa237c7a6 /app/views/about | |
| parent | 96c3d26870d4c8db1978c86b259e85d060d6f271 (diff) | |
| parent | 4c4ff05a461eddafbf38c603b1bf2029be36a0b9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/about')
| -rw-r--r-- | app/views/about/more.html.haml | 2 | ||||
| -rw-r--r-- | app/views/about/show.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 99028935f..87f1071d9 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -24,7 +24,7 @@ %span= t 'about.status_count_after', count: @instance_presenter.status_count .row__mascot .landing-page__mascot - = image_tag asset_pack_path('elephant_ui_plane.svg'), alt: '' + = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('elephant_ui_plane.svg'), alt: '' .column-2 .landing-page__information.contact-widget diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 48435fe9c..6c28f83ce 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -62,7 +62,7 @@ %span= t 'about.status_count_after', count: @instance_presenter.status_count .row__mascot .landing-page__mascot - = image_tag asset_pack_path('elephant_ui_plane.svg'), alt: '' + = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('elephant_ui_plane.svg'), alt: '' - else .column-2.non-preview @@ -94,7 +94,7 @@ %span= t 'about.status_count_after', count: @instance_presenter.status_count .row__mascot .landing-page__mascot - = image_tag asset_pack_path('elephant_ui_plane.svg'), alt: '' + = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('elephant_ui_plane.svg'), alt: '' - if Setting.timeline_preview .column-3 |