From d78f4a8faf10058b7d0c47803ad9a9fd896261da Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 11 Oct 2018 10:23:34 +0200 Subject: [PATCH 1/2] [#2692] Make the sign up button a primary button on the sign in page --- app/views/users/sessions/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml index 943afd7a3..daf99bc9f 100644 --- a/app/views/users/sessions/new.html.haml +++ b/app/views/users/sessions/new.html.haml @@ -57,4 +57,4 @@ %p.register %span Nouveau sur demarches-simplifiees.fr ? - = link_to "Créer un compte", new_registration_path(resource_name), class: "button auth-signup-button" + = link_to "Créer un compte", new_registration_path(resource_name), class: "button primary auth-signup-button" From 56cfcd08d3ad18227c04081e6369a3d1d943c507 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 11 Oct 2018 10:24:11 +0200 Subject: [PATCH 2/2] [Fix #2692] Move the sign up CTA at the top of the sign in page --- app/assets/stylesheets/new_design/auth.scss | 4 ++-- app/views/users/sessions/new.html.haml | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/new_design/auth.scss b/app/assets/stylesheets/new_design/auth.scss index 0660c050f..d1221bcd3 100644 --- a/app/assets/stylesheets/new_design/auth.scss +++ b/app/assets/stylesheets/new_design/auth.scss @@ -97,8 +97,8 @@ $auth-breakpoint: $two-columns-breakpoint; } hr { - margin-top: 60px; - margin-bottom: 20px; + margin-top: 30px; + margin-bottom: 30px; background-color: $grey; border: none; height: 1px; diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml index daf99bc9f..d231b6ac9 100644 --- a/app/views/users/sessions/new.html.haml +++ b/app/views/users/sessions/new.html.haml @@ -23,6 +23,14 @@ = h simple_format(@dossier.procedure.description) .column.auth-form + - if resource_name == :user + %p.register + %span + Nouveau sur demarches-simplifiees.fr ? + = link_to "Créer un compte", new_registration_path(resource_name), class: "button primary auth-signup-button" + + %hr + = form_for @user, url: user_session_path, html: { class: "form" } do |f| %h1 Connectez-vous @@ -51,10 +59,3 @@ .center = link_to "Qu’est-ce que FranceConnect ?", "https://app.franceconnect.gouv.fr/en-savoir-plus", target: "_blank", class: "link" - - - if resource_name == :user - %hr - %p.register - %span - Nouveau sur demarches-simplifiees.fr ? - = link_to "Créer un compte", new_registration_path(resource_name), class: "button primary auth-signup-button"