Improve UI/UX for reset_password, signup, confirmation pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

5 files changed, 37 insertions, 20 deletions

diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml
index 387ec7676d4..cf111e1f02b 100644
--- a/app/views/devise/confirmations/new.html.haml
+++ b/app/views/devise/confirmations/new.html.haml
@@ -1,8 +1,14 @@
 .login-box
   %h3.page-title Resend confirmation instructions
   = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
-    = devise_error_messages!
-    = f.email_field :email, placeholder: 'Email'
-    %div= f.submit "Resend confirmation instructions", class: 'btn btn-success'
+    .devise-errors
+      = devise_error_messages!
+    = f.email_field :email, placeholder: 'Email', class: "text", required: true
+    .clearfix.append-bottom-10
+      = f.submit "Resend confirmation instructions", class: 'btn btn-success'
   %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)
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index 3e4a4a0f1c8..fb519e7d654 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -1,11 +1,12 @@
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "login-box" }) do |f|
   %h3 Change your password
-  = devise_error_messages!
+  .devise-errors
+    = devise_error_messages!
   = f.hidden_field :reset_password_token
   %div
-    = f.password_field :password, class: "text top", placeholder: "New password"
+    = f.password_field :password, class: "text top", placeholder: "New password", required: true
   %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
   .clearfix.append-bottom-10
     = f.submit "Change my password", class: "btn btn-primary"
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 3df65d037af..5d6df7d8925 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -1,10 +1,13 @@
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
   %h3.page-title Reset password
-  = devise_error_messages!
-  = f.email_field :email, placeholder: "Email",  class: "text"
-  %br/
-  %br/
-  = f.submit "Reset password", class: "btn-primary btn"
-  .pull-right
-    = link_to "Sign in", new_session_path(resource_name), class: "btn"
-    %br/
+  .devise-errors
+    = devise_error_messages!
+  = f.email_field :email, placeholder: "Email",  class: "text", required: true
+  .clearfix.append-bottom-10
+    = f.submit "Reset password", class: "btn-primary btn"
+  %hr
+  %p
+    %span.light
+      Already have login and password?
+    %strong
+      = link_to "Sign in", new_session_path(resource_name)
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index d749d7bac09..a3ac3e43565 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,7 +1,7 @@
 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
   %h3.page-title Sign Up
-  %br
-  = devise_error_messages!
+  .devise-errors
+    = devise_error_messages!
   %div
     = f.text_field :name, class: "text top", placeholder: "Name", required: true
   %div
@@ -15,5 +15,10 @@
   %div
     = f.submit "Sign up", class: "btn-create btn"
   %hr
-  = link_to "Sign in", new_session_path(resource_name)
-  = link_to "Forgot your password?", new_password_path(resource_name), class: "pull-right"
+  %p
+    %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)
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index c4729836faa..c5041dd71b8 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -11,5 +11,7 @@
             GitLab is open source software to collaborate on code.
             %br
             #{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}.
-        %hr
+    %hr
+    .container
+      .content
         = yield