treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix blur behind closed registration message (#12442) 

* Fix closed registration message blur

* Adjust overlay margins to account for blur

Fixes #12425
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
ThibG 2019-11-22 15:56:59 +01:00 committed by Eugen Rochko
parent a60b602ade
commit 42b3b019e0
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/styles/mastodon/forms.scss
View File

@ -513,6 +513,10 @@ code {
&__overlay-area { &__overlay-area {
position: relative; position: relative;
&__blurred form {
filter: blur(2px);
}
&__overlay { &__overlay {
position: absolute; position: absolute;
top: 0; top: 0;
@ -523,8 +527,10 @@ code {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background: rgba($ui-base-color, 0.65); background: rgba($ui-base-color, 0.65);
backdrop-filter: blur(2px);
border-radius: 4px; border-radius: 4px;
margin-left: -4px;
margin-top: -4px;
padding: 4px;
&__content { &__content {
text-align: center; text-align: center;

14
app/views/about/_registration.html.haml
View File

@ -1,5 +1,5 @@
= simple_form_for(new_user, url: user_registration_path, namespace: 'registration') do |f| .simple_form__overlay-area{ class: (closed_registrations? && @instance_presenter.closed_registrations_message.present?) ? 'simple_form__overlay-area__blurred' : '' }
.simple_form__overlay-area = simple_form_for(new_user, url: user_registration_path, namespace: 'registration') do |f|
%p.lead= t('about.federation_hint_html', instance: content_tag(:strong, site_hostname)) %p.lead= t('about.federation_hint_html', instance: content_tag(:strong, site_hostname))
.fields-group .fields-group
@ -21,8 +21,8 @@
.actions .actions
= f.button :button, sign_up_message, type: :submit, class: 'button button-primary', disabled: closed_registrations? = f.button :button, sign_up_message, type: :submit, class: 'button button-primary', disabled: closed_registrations?
- if closed_registrations? && @instance_presenter.closed_registrations_message.present? - if closed_registrations? && @instance_presenter.closed_registrations_message.present?
.simple_form__overlay-area__overlay .simple_form__overlay-area__overlay
.simple_form__overlay-area__overlay__content.rich-formatting .simple_form__overlay-area__overlay__content.rich-formatting
.block-icon= fa_icon 'warning' .block-icon= fa_icon 'warning'
= @instance_presenter.closed_registrations_message.html_safe = @instance_presenter.closed_registrations_message.html_safe