Browse Source

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
pull/4/head
Eugen Rochko 6 years ago
committed by GitHub
parent
commit
5acd5315f2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 5 deletions
  1. +22
    -0
      app/javascript/styles/mastodon/about.scss
  2. +6
    -5
      app/views/about/_forms.html.haml
  3. +1
    -0
      config/locales/en.yml

+ 22
- 0
app/javascript/styles/mastodon/about.scss View File

@ -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;

+ 6
- 5
app/views/about/_forms.html.haml View File

@ -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')

+ 1
- 0
config/locales/en.yml View File

@ -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

Loading…
Cancel
Save