summaryrefslogtreecommitdiff
path: root/app/views/devise/passwords
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-05 15:56:58 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-05 19:12:47 +0100
commit485e55f88c6f2a50f1d88188a015fb1572f8bd94 (patch)
tree184a601fa06d005f8693acea33a8db6ddae8b6f6 /app/views/devise/passwords
parent0a9cab4ee65f2b42c56989698c401cab60d68b53 (diff)
downloadgitlab-ce-485e55f88c6f2a50f1d88188a015fb1572f8bd94.tar.gz
Clean up devise views.
Diffstat (limited to 'app/views/devise/passwords')
-rw-r--r--app/views/devise/passwords/edit.html.haml11
-rw-r--r--app/views/devise/passwords/new.html.haml7
2 files changed, 10 insertions, 8 deletions
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index 1326cc0aac9..0640739b5d7 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -10,9 +10,10 @@
= f.password_field :password, class: "form-control top", placeholder: "New password", required: true
%div
= 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"
- .login-footer
- %p
- = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
- = render 'devise/shared/sign_in_link'
+
+.clearfix.prepend-top-20
+ %p
+ = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+ = render 'devise/shared/sign_in_link'
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index b8af1b8693a..e8820daf58f 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -7,7 +7,8 @@
= devise_error_messages!
.clearfix.append-bottom-20
= f.email_field :email, placeholder: "Email", class: "form-control", required: true
- .clearfix.append-bottom-10
+ .clearfix
= f.submit "Reset password", class: "btn-primary btn"
- .login-footer
- = render 'devise/shared/sign_in_link'
+
+.clearfix.prepend-top-20
+ = render 'devise/shared/sign_in_link'