diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-28 17:45:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-28 17:45:06 +0200 |
| commit | 3d73d76e551193a9beffec7a8cdf67e3d18978cf (patch) | |
| tree | cf2f72e84c0b99b9130ced6ee1dcd831756e7361 /app/views | |
| parent | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (diff) | |
| parent | b793722d7d7df856466331729d523c807273b003 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 34c25a7d1..f11fddd4d 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -39,3 +39,6 @@ %body{ class: body_classes } = content_for?(:content) ? yield(:content) : yield + + %div{ style: 'display: none'} + = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg') diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index b4a21caf1..37808cdd0 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -35,9 +35,7 @@ %li= link_to t('about.api'), 'https://docs.joinmastodon.org/api/guidelines/' .column-2 %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/' - - = link_to root_url, class: 'brand' do - = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg') + = link_to svg_logo, root_url, class: 'brand' .column-3 %h4= site_hostname %ul |