diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 13:34:51 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 15:10:34 +0200 |
| commit | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (patch) | |
| tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/views/layouts | |
| parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
| parent | a2cabf3f4af9271d8bfdb13c1ae2b7a8b4e6fb88 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
Diffstat (limited to 'app/views/layouts')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9ede598b3..21713f72e 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -21,6 +21,9 @@ = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags + - if Setting.custom_css.present? + = stylesheet_link_tag custom_css_path, media: 'all' + = yield :header_tags -# These must come after :header_tags to ensure our initial state has been defined. diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 24911bb1e..bfa385f58 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -11,7 +11,7 @@ = 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'), new_user_registration_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 |