DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Align the remember me and forgotten password items

Browse source
This commit is contained in:
gregoirenovel 2017-10-19 16:04:45 +02:00
parent fcc76c1d36
commit a43ec4e0d1
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/stylesheets/new_design/auth.scss
View file

@ -65,13 +65,15 @@ $auth-breakpoint: $two-columns-breakpoint;
} }
.auth-form { .auth-form {
.reset-password { .auth-options {
margin-top: - 3 * $default-spacer; display: flex;
margin-bottom: $default-spacer; justify-content: space-between;
margin-bottom: 4 * $default-spacer;
} }
.remember-me { .remember-me {
display: inline-block; display: inline-block;
margin-bottom: 0;
} }
.separation { .separation {
@ -127,3 +129,13 @@ $auth-breakpoint: $two-columns-breakpoint;
} }
} }
} }
.sign-in-form .form {
input[type="password"] {
margin-bottom: $default-spacer;
}
input[type="checkbox"] {
margin-bottom: 0;
}
}

16
app/views/users/sessions/new.html.haml
View file

@ -22,7 +22,7 @@
.procedure-description .procedure-description
= h simple_format(@dossier.procedure.description) = h simple_format(@dossier.procedure.description)
.column.auth-form .column.auth-form.sign-in-form
- if resource_name == :user - if resource_name == :user
%p.register %p.register
%span %span
@ -40,13 +40,15 @@
= f.label :password, "Mot de passe" = f.label :password, "Mot de passe"
= f.password_field :password, value: @user.password, placeholder: "8 caractères minimum" = f.password_field :password, value: @user.password, placeholder: "8 caractères minimum"
- if [:user, :gestionnaire].include?(resource_name) .auth-options
.reset-password.text-right - if devise_mapping.rememberable?
= link_to "Mot de passe oublié ?", new_password_path(resource_name), class: "link" %div
= f.check_box :remember_me, as: :boolean
= f.label :remember_me, "Se souvenir de moi", class: 'remember-me'
- if devise_mapping.rememberable? - if [:user, :gestionnaire].include?(resource_name)
= f.check_box :remember_me, as: :boolean .text-right
= f.label :remember_me, "Se souvenir de moi", class: 'remember-me' = link_to "Mot de passe oublié ?", new_password_path(resource_name), class: "link"
= f.submit "Se connecter", class: "button large primary expand" = f.submit "Se connecter", class: "button large primary expand"