diff --git a/app/assets/images/logo_FC_02.png b/app/assets/images/logo_FC_02.png new file mode 100644 index 000000000..f69cbb86b Binary files /dev/null and b/app/assets/images/logo_FC_02.png differ diff --git a/app/assets/images/logo_FC_02_original.png b/app/assets/images/logo_FC_02_original.png new file mode 100644 index 000000000..c082a8826 Binary files /dev/null and b/app/assets/images/logo_FC_02_original.png differ diff --git a/app/assets/images/logo_FC_03.svg b/app/assets/images/logo_FC_03.svg deleted file mode 100644 index 48462bd89..000000000 --- a/app/assets/images/logo_FC_03.svg +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8108bd6ea..71c9e78e5 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -84,9 +84,3 @@ textarea#description { input#nom_projet { width: 100%; } - -.border-left { - border-left-color: #CCCCCC; - border-left-style: solid; - border-left-width: 1px; -} \ No newline at end of file diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 228d5424e..4da0a6e5e 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -1,14 +1,36 @@ #form_login{ - h4{ - margin-top:11px; + text-align: center; + max-width:500px; + + margin-left:auto; + margin-right:auto; + + padding: 20px; + + #btn_fc { + background-image: url('/assets/logo_FC_02.png'); + background-repeat: no-repeat; + background-size: 38px; + background-position-x: 5px; + background-position-y: 1px; } - input { - max-width:50%; - margin-top:5px; + + + #new_user{ + width: 80%; margin-left:auto; margin-right:auto; } - #logo_fc { - margin-bottom:36px; + + hr { + margin-top: 50px; + margin-bottom: 40px; + border: 0; + height: 1px; + background-image: linear-gradient(to right, rgba(100, 100, 100, 0), rgba(100, 100, 100, 0.75), rgba(100, 100, 100, 0)); + } + + h4 { + text-align: left; } } \ No newline at end of file diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml index d7a12604c..aa1ee2dde 100644 --- a/app/views/users/sessions/new.html.haml +++ b/app/views/users/sessions/new.html.haml @@ -1,30 +1,36 @@ -%div{style:'text-align:center'} - %h2#login_user Connexion +#form_login + %h1#login_user Connexion %br - %div#form_login.row - %div.col-md-6.col-lg-6 - = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| - %h4 - = f.label :email - = f.email_field :email, autofocus: true, class: 'form-control' - %br - %h4 - = f.label :password - = f.password_field :password, autocomplete: "off", class: 'form-control' - %br - / - if devise_mapping.rememberable? - / .field - / = f.check_box :remember_me - / = f.label :remember_me - .actions - = f.submit "Se connecter", class:'btn btn-primary btn-lg' - %br + %br + %a.btn.btn-default.btn-lg.btn-primary#btn_fc{href: '/france_connect'} + %div{style:'margin-left:35px'} + S'identifier avec + France Connect + + + %hr + + = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| + %h4 + = f.label :email + .input-group + .input-group-addon + %span.glyphicon.glyphicon-user + = f.email_field :email, class: 'form-control' + %br + %h4 + = f.label :password + .input-group + .input-group-addon + %span.glyphicon.glyphicon-asterisk + = f.password_field :password, autocomplete: "off", class: 'form-control' + %br + %br + .actions + = f.submit "Se connecter", class:'btn btn-primary' + %br + + = render "users/shared/links" - = render "users/shared/links" - %div.col-md-6.col-lg-6.border-left - %img#logo_fc{src: '/assets/logo_FC_03.png', style:'max-height:180px'} - %br - %button.btn.btn-info.btn-lg - = link_to "Connexion", '/france_connect', id: 'france_connect', style:'color:white; text-decoration: none' diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb index cd795adb6..93f636bc0 100644 --- a/app/views/users/shared/_links.html.erb +++ b/app/views/users/shared/_links.html.erb @@ -3,11 +3,11 @@ <% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "S'inscrire", new_registration_path(resource_name) %>
<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= link_to "Mot de passe oubliƩ ?", new_password_path(resource_name) %>
<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>