Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Dmitriy Zaporozhets
2 parents 654d876c 9ca80048
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
app/views/devise/passwords/new.html.haml
@@ -2,7 +2,8 @@
   %h3.page-title Reset password
   .devise-errors
     = devise_error_messages!
-  = f.email_field :email, placeholder: "Email",  class: "form-control", required: true
+  .clearfix.append-bottom-20
+    = f.email_field :email, placeholder: "Email",  class: "form-control", required: true
   .clearfix.append-bottom-10
     = f.submit "Reset password", class: "btn-primary btn"
   %hr
...	...	@@ -2,7 +2,8 @@
2	2	%h3.page-title Reset password
3	3	.devise-errors
4	4	= devise_error_messages!
5		- = f.email_field :email, placeholder: "Email", class: "form-control", required: true
	5	+ .clearfix.append-bottom-20
	6	+ = f.email_field :email, placeholder: "Email", class: "form-control", required: true
6	7	.clearfix.append-bottom-10
7	8	= f.submit "Reset password", class: "btn-primary btn"
8	9	%hr
...	...