Commit 42003f53 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve UI/UX for reset_password, signup, confirmation pages

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 6f556d8e
.login-box .login-box
%h3.page-title Resend confirmation instructions %h3.page-title Resend confirmation instructions
= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
= devise_error_messages! .devise-errors
= f.email_field :email, placeholder: 'Email' = devise_error_messages!
%div= f.submit "Resend confirmation instructions", class: 'btn btn-success' = f.email_field :email, placeholder: 'Email', class: "text", required: true
.clearfix.append-bottom-10
= f.submit "Resend confirmation instructions", class: 'btn btn-success'
%hr %hr
= link_to "Sign in", new_session_path(resource_name) %p
%span.light
Already have login and password?
%strong
= link_to "Sign in", new_session_path(resource_name)
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "login-box" }) do |f| = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "login-box" }) do |f|
%h3 Change your password %h3 Change your password
= devise_error_messages! .devise-errors
= devise_error_messages!
= f.hidden_field :reset_password_token = f.hidden_field :reset_password_token
%div %div
= f.password_field :password, class: "text top", placeholder: "New password" = f.password_field :password, class: "text top", placeholder: "New password", required: true
%div %div
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password" = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password", required: true
%div %div
.clearfix.append-bottom-10 .clearfix.append-bottom-10
= f.submit "Change my password", class: "btn btn-primary" = f.submit "Change my password", class: "btn btn-primary"
......
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
%h3.page-title Reset password %h3.page-title Reset password
= devise_error_messages! .devise-errors
= f.email_field :email, placeholder: "Email", class: "text" = devise_error_messages!
%br/ = f.email_field :email, placeholder: "Email", class: "text", required: true
%br/ .clearfix.append-bottom-10
= f.submit "Reset password", class: "btn-primary btn" = f.submit "Reset password", class: "btn-primary btn"
.pull-right %hr
= link_to "Sign in", new_session_path(resource_name), class: "btn" %p
%br/ %span.light
Already have login and password?
%strong
= link_to "Sign in", new_session_path(resource_name)
= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f| = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
%h3.page-title Sign Up %h3.page-title Sign Up
%br .devise-errors
= devise_error_messages! = devise_error_messages!
%div %div
= f.text_field :name, class: "text top", placeholder: "Name", required: true = f.text_field :name, class: "text top", placeholder: "Name", required: true
%div %div
...@@ -15,5 +15,10 @@ ...@@ -15,5 +15,10 @@
%div %div
= f.submit "Sign up", class: "btn-create btn" = f.submit "Sign up", class: "btn-create btn"
%hr %hr
= link_to "Sign in", new_session_path(resource_name) %p
= link_to "Forgot your password?", new_password_path(resource_name), class: "pull-right" %span.light
Have an account?
%strong
= link_to "Sign in", new_session_path(resource_name)
%p
= link_to "Forgot your password?", new_password_path(resource_name)
...@@ -11,5 +11,7 @@ ...@@ -11,5 +11,7 @@
GitLab is open source software to collaborate on code. GitLab is open source software to collaborate on code.
%br %br
#{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}. #{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}.
%hr %hr
.container
.content
= yield = yield
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment