From 5acd5315f23b4472f31c4a0bb612b7356032defc Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 8 Mar 2018 11:10:37 +0100 Subject: [PATCH] Improve styling of closed registrations message, rename button (#6695) * Improve styling of closed registrations message, rename button "Sign up on another server" Fix #6683 * Adjust styling of closed registrations message --- app/javascript/styles/mastodon/about.scss | 22 ++++++++++++++++++++++ app/views/about/_forms.html.haml | 11 ++++++----- config/locales/en.yml | 1 + 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss index f2991813549..c484f074b6c 100644 --- a/app/javascript/styles/mastodon/about.scss +++ b/app/javascript/styles/mastodon/about.scss @@ -194,6 +194,28 @@ $small-breakpoint: 960px; } } + .closed-registrations-message { + margin-top: 20px; + + &, + p { + text-align: center; + font-size: 12px; + line-height: 18px; + color: $ui-primary-color; + margin-bottom: 0; + + a { + color: $ui-highlight-color; + text-decoration: underline; + } + } + + p:last-child { + margin-bottom: 0; + } + } + em { display: inline; margin: 0; diff --git a/app/views/about/_forms.html.haml b/app/views/about/_forms.html.haml index 9916b6bf4cd..81f7173f7b1 100644 --- a/app/views/about/_forms.html.haml +++ b/app/views/about/_forms.html.haml @@ -1,12 +1,13 @@ - if @instance_presenter.open_registrations = render 'registration' - else - - if @instance_presenter.closed_registrations_message.blank? - %p= t('about.closed_registrations') - - else - = @instance_presenter.closed_registrations_message.html_safe + = link_to t('auth.register_elsewhere'), 'https://joinmastodon.org', class: 'button button-primary' - = link_to t('auth.register'), 'https://joinmastodon.org', class: 'button button-primary' + .closed-registrations-message + - if @instance_presenter.closed_registrations_message.blank? + %p= t('about.closed_registrations') + - else + = @instance_presenter.closed_registrations_message.html_safe .separator-or %span= t('auth.or') diff --git a/config/locales/en.yml b/config/locales/en.yml index 176135657d8..2dd09626d14 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -376,6 +376,7 @@ en: cas: CAS saml: SAML register: Sign up + register_elsewhere: Sign up on another server resend_confirmation: Resend confirmation instructions reset_password: Reset password security: Security