diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-12-09 13:28:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-09 16:08:04 +0100 |
| commit | e7f1bfdc2d528f137299ba0c3ab2a30f2f91f53c (patch) | |
| tree | 2693ffce4d340a9b77a7ca52c856aaae7af8c913 /app/views/layouts | |
| parent | e3682c9c1750e5e7e5d2f817e29f6760a18400ca (diff) | |
| parent | 81bda7d67c984c9bfcb5bca94e50cec6405b492e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/public.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index fd5c67a99..ee49ed06c 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -5,6 +5,10 @@ .nav-left = link_to root_url, class: 'brand' do = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' + + = link_to t('directories.directory'), explore_path, class: 'nav-link' + = link_to t('about.about_this'), about_more_path, class: 'nav-link' + = link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link' .nav-center .nav-right - if user_signed_in? |