diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-06-10 22:25:36 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-11 00:08:41 +0200 |
commit | 15929a3d597cc8f50091e602be5277ab00574286 (patch) | |
tree | e009a465c83a984f0e69776ee3aa0d27401f6e98 /app/views/layouts/public.html.haml | |
parent | 970f06331bc7e482226e974c468b559a9e2f3fa3 (diff) | |
parent | f09a66b9a741515532a1bfa0f2c3af08d9cc84b6 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
Diffstat (limited to 'app/views/layouts/public.html.haml')
-rw-r--r-- | app/views/layouts/public.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 1a789cef8..f4ef199e6 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -8,7 +8,7 @@ %nav.header .nav-left = link_to root_url, class: 'brand' do - = svg_logo_full + = logo_as_symbol(:wordmark) - unless whitelist_mode? = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory @@ -41,7 +41,7 @@ %li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/' .column-2 %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/' - = link_to svg_logo, root_url, class: 'brand' + = link_to logo_as_symbol, root_url, class: 'brand' .column-3 %h4= site_hostname %ul |