mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 21:15:58 +00:00
034ffc079e
Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.
53 lines
2.2 KiB
Plaintext
53 lines
2.2 KiB
Plaintext
- content_for :content do
|
|
.public-layout
|
|
.container
|
|
%nav.header
|
|
.nav-left
|
|
= link_to root_url, class: 'brand' do
|
|
= image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
|
|
|
|
- if Setting.profile_directory
|
|
= link_to t('directories.directory'), explore_path, class: 'nav-link optional'
|
|
= link_to t('about.about_this'), about_more_path, class: 'nav-link optional'
|
|
= link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link optional'
|
|
.nav-center
|
|
.nav-right
|
|
- if user_signed_in?
|
|
= link_to t('settings.back'), root_url, class: 'nav-link nav-button webapp-btn'
|
|
- else
|
|
= link_to t('auth.login'), new_user_session_path, class: 'webapp-btn nav-link nav-button'
|
|
= link_to t('auth.register'), open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started', class: 'webapp-btn nav-link nav-button'
|
|
|
|
.container= yield
|
|
|
|
.container
|
|
.footer
|
|
.grid
|
|
.column-0
|
|
%h4= t 'footer.resources'
|
|
%ul
|
|
%li= link_to t('about.terms'), terms_path
|
|
%li= link_to t('about.privacy_policy'), terms_path
|
|
.column-1
|
|
%h4= t 'footer.developers'
|
|
%ul
|
|
%li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
|
|
%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')
|
|
.column-3
|
|
%h4= site_hostname
|
|
%ul
|
|
%li= link_to t('about.about_this'), about_more_path
|
|
%li= "v#{Mastodon::Version.to_s}"
|
|
.column-4
|
|
%h4= t 'footer.more'
|
|
%ul
|
|
%li= link_to t('about.source_code'), Mastodon::Version.source_url
|
|
%li= link_to t('about.apps'), 'https://joinmastodon.org/apps'
|
|
|
|
= render template: 'layouts/application'
|