diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-02 08:39:52 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-02 08:39:52 -0600 |
| commit | 4c1fd9a19c779fa6e7d74513c61f37ce05a841b3 (patch) | |
| tree | 0cf23810e2f7ff0f45c65a3f2f9b35016587c68a /app/views/about/more.html.haml | |
| parent | ad3a2dfb66abc01a90807f23191b7e28c3c242ed (diff) | |
| parent | 33f56811e38bc330de9dcfa6794c29a176a30311 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/views/about/more.html.haml')
| -rw-r--r-- | app/views/about/more.html.haml | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index d92362bd7..84daadba8 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -7,22 +7,7 @@ .landing-page .header-wrapper.compact .header - .container.links - .brand - = link_to root_url do - = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' - - %ul.nav - %li - - if user_signed_in? - = link_to t('settings.back'), root_url, class: 'webapp-btn' - - else - = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' - %li= link_to t('about.about_this'), about_more_path - %li - = link_to 'https://joinmastodon.org/' do - = "#{t('about.other_instances')}" - %i.fa.fa-external-link{ style: 'padding-left: 5px;' } + = render 'links' .container.hero .heading |