diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-08 11:10:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 11:10:37 +0100 |
| commit | 5acd5315f23b4472f31c4a0bb612b7356032defc (patch) | |
| tree | e9340c18e54aca550253bb6ba7c03f67a3e01e7f /app | |
| parent | b79ab15859e7f8383526afd147e8416d2df2f7a7 (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/styles/mastodon/about.scss | 22 | ||||
| -rw-r--r-- | app/views/about/_forms.html.haml | 11 |
2 files changed, 28 insertions, 5 deletions
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss index f29918135..c484f074b 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 9916b6bf4..81f7173f7 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') |