diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-20 02:29:25 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-20 02:29:25 +0000 |
| commit | c339d49d82b3fd2873831029d9c92b3fbf1236e3 (patch) | |
| tree | 5a8528475f089f1e592dfbedd37ee91e6f748ffc /app/views/layouts | |
| parent | b6e9537de469a178ce195b75fe8eaf03735e785a (diff) | |
| parent | f4d28ccfa3f9fd38a6d219fcde2d1a8bfcf6b306 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/modal.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml index e808593cd..a86b4fd3f 100644 --- a/app/views/layouts/modal.html.haml +++ b/app/views/layouts/modal.html.haml @@ -1,5 +1,5 @@ - content_for :content do - - if user_signed_in? + - if user_signed_in? && !@hide_header .account-header .avatar= image_tag current_account.avatar.url(:original) .name diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 098262b2e..24911bb1e 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -42,6 +42,6 @@ %h4= t 'footer.more' %ul %li= link_to t('about.source_code'), Mastodon::Version.source_url - %li= link_to 'joinmastodon.org', 'https://joinmastodon.org' + %li= link_to t('about.apps'), 'https://joinmastodon.org/apps' = render template: 'layouts/application' |