Commit 72cf8173 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'clean-up-devise-views' into 'master'

Clean up devise views

See merge request !1472
parents 2c3fe16f 485e55f8
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
.login-footer { .login-footer {
margin-top: 10px; margin-top: 10px;
p:last-child {
margin-bottom: 0;
}
} }
a.forgot { a.forgot {
...@@ -88,6 +92,7 @@ ...@@ -88,6 +92,7 @@
.devise-errors { .devise-errors {
h2 { h2 {
margin-top: 0;
font-size: 14px; font-size: 14px;
color: #a00; color: #a00;
} }
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
= devise_error_messages! = devise_error_messages!
.clearfix.append-bottom-20 .clearfix.append-bottom-20
= f.email_field :email, placeholder: 'Email', class: "form-control", required: true = f.email_field :email, placeholder: 'Email', class: "form-control", required: true
.clearfix.append-bottom-10 .clearfix
= f.submit "Resend confirmation instructions", class: 'btn btn-success' = f.submit "Resend confirmation instructions", class: 'btn btn-success'
.login-footer
.clearfix.prepend-top-20
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
...@@ -10,9 +10,10 @@ ...@@ -10,9 +10,10 @@
= f.password_field :password, class: "form-control top", placeholder: "New password", required: true = f.password_field :password, class: "form-control top", placeholder: "New password", required: true
%div %div
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true
.clearfix.append-bottom-10 .clearfix
= f.submit "Change my password", class: "btn btn-primary" = f.submit "Change my password", class: "btn btn-primary"
.login-footer
.clearfix.prepend-top-20
%p %p
= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
= devise_error_messages! = devise_error_messages!
.clearfix.append-bottom-20 .clearfix.append-bottom-20
= f.email_field :email, placeholder: "Email", class: "form-control", required: true = f.email_field :email, placeholder: "Email", class: "form-control", required: true
.clearfix.append-bottom-10 .clearfix
= f.submit "Reset password", class: "btn-primary btn" = f.submit "Reset password", class: "btn-primary btn"
.login-footer
.clearfix.prepend-top-20
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
.login-box = render 'devise/shared/signup_box'
.login-heading
%h3 Sign up .clearfix.prepend-top-20
.login-body = render 'devise/shared/sign_in_link'
= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
.devise-errors
= devise_error_messages!
%div
= f.text_field :name, class: "form-control top", placeholder: "Name", required: true
%div
= f.text_field :username, class: "form-control middle", placeholder: "Username", required: true
%div
= f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
%div
= f.password_field :password, class: "form-control middle", placeholder: "Password", required: true
%div
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm password", required: true
%div
= f.submit "Sign up", class: "btn-create btn"
.login-footer
%p %p
%span.light %span.light Did not receive confirmation email?
Have an account? = link_to "Send again", new_confirmation_path(resource_name)
%strong \ No newline at end of file
= link_to "Sign in", new_session_path(resource_name)
%p
= link_to "Forgot your password?", new_password_path(resource_name)
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
= f.text_field :username, class: "form-control middle", placeholder: "Username", required: true = f.text_field :username, class: "form-control middle", placeholder: "Username", required: true
%div %div
= f.email_field :email, class: "form-control middle", placeholder: "Email", required: true = f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
.form-group#password-strength .form-group.append-bottom-20#password-strength
= f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "Password", required: true = f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "Password", required: true
%div %div
= f.submit "Sign up", class: "btn-create btn" = f.submit "Sign up", class: "btn-create btn"
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