diff --git a/app/javascript/images/bliss/login.jpg b/app/javascript/images/bliss/login.jpg new file mode 100644 index 000000000..8389e7407 Binary files /dev/null and b/app/javascript/images/bliss/login.jpg differ diff --git a/app/javascript/images/bliss/login.xcf b/app/javascript/images/bliss/login.xcf new file mode 100644 index 000000000..d20b0ed28 Binary files /dev/null and b/app/javascript/images/bliss/login.xcf differ diff --git a/app/javascript/images/bliss/register.jpg b/app/javascript/images/bliss/register.jpg new file mode 100644 index 000000000..cfb0eec35 Binary files /dev/null and b/app/javascript/images/bliss/register.jpg differ diff --git a/app/javascript/images/bliss/register.xcf b/app/javascript/images/bliss/register.xcf new file mode 100644 index 000000000..538bc74ba Binary files /dev/null and b/app/javascript/images/bliss/register.xcf differ diff --git a/app/javascript/styles/mastodon/_custom.scss b/app/javascript/styles/mastodon/_custom.scss index 65d720bd1..2d3b03294 100644 --- a/app/javascript/styles/mastodon/_custom.scss +++ b/app/javascript/styles/mastodon/_custom.scss @@ -1,6 +1,40 @@ -.custom-img img{ +.custom-img img { width: 100%; max-width: 50vw; display: block; margin: 0 auto; } + +.custom_message_heading { + font-size: 2em; + margin-bottom: 0.5em; + text-align: center; +} + +.auth-page { + position: absolute; + top: 0; + width: 100%; + background: url('../images/bliss/a_travers_pic_mastodon_grey.jpg') no-repeat fixed center; + background-size: cover; + + .form-container{ + background: rgba(0,0,0,0.5); + } + .logo-container{ + width: 200px; + } + .img-custom{ + text-align:center; + img { + width: 400px; + max-width: 90vw; + margin: 1em auto; + display:inline-block; + } + } + .title{ + font-size: 3em; + margin-bottom: 0.5em; + } +} diff --git a/app/views/about/_login.html.haml b/app/views/about/_login.html.haml index fa58f04d7..e8da68466 100644 --- a/app/views/about/_login.html.haml +++ b/app/views/about/_login.html.haml @@ -1,4 +1,9 @@ = simple_form_for(new_user, url: user_session_path, namespace: 'login') do |f| + %h2.custom_message_heading= t('auth.login') + .landing__custom_img + = class: 'custom-img' do + = image_tag asset_pack_path('media/images/bliss/login.jpg'), alt: @instance_presenter.site_title + %span.brand__tagline=t 'about.tagline' .fields-group - if use_seamless_external_login? = f.input :email, placeholder: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }, hint: false diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml index e4d614d71..33f2b13c2 100644 --- a/app/views/about/_registration.html.haml +++ b/app/views/about/_registration.html.haml @@ -1,6 +1,9 @@ .simple_form__overlay-area{ class: (closed_registrations? && @instance_presenter.closed_registrations_message.present?) ? 'simple_form__overlay-area__blurred' : '' } = simple_form_for(new_user, url: user_registration_path, namespace: 'registration', html: { novalidate: false }) do |f| - %p.lead= t('about.federation_hint_html', instance: content_tag(:strong, site_hostname)) + %h3.custom_message_heading= t('auth.register') + .landing__custom_img + = class: 'custom-img' do + = image_tag asset_pack_path('media/images/bliss/register.jpg'), alt: @instance_presenter.site_title .fields-group = f.simple_fields_for :account do |account_fields| diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 8d89b81ee..acf9e25e2 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -37,7 +37,7 @@ .directory__tag = optional_link_to Setting.timeline_preview, public_timeline_path do %h4 - = fa_icon 'globe fw' + = fa_icon 'globe fw fa-3x' = t('about.see_whats_happening') %small= t('about.browse_public_posts') diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml index 0ea3bbe3b..82d70292e 100644 --- a/app/views/layouts/auth.html.haml +++ b/app/views/layouts/auth.html.haml @@ -2,15 +2,21 @@ = javascript_pack_tag 'public', crossorigin: 'anonymous' - content_for :content do - .container-alt - .logo-container - %h1 - = link_to root_path do - = svg_logo_full + .auth-page.content + .container-alt + .logo-container + %h1 + = link_to root_path do + = svg_logo_full + .img-custom + = image_tag asset_pack_path('media/images/bliss/login.jpg'), alt: @instance_presenter.site_title - .form-container - = render 'flashes' + .form-container + = render 'flashes' - = yield + %h2.title.is-2 + = t('auth.login') + + = yield = render template: 'layouts/application'