Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/devise/passwords/new.html.erb23
-rw-r--r--app/views/devise/sessions/new.html.erb4
2 files changed, 10 insertions, 17 deletions
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index bccf0181769..01cb3375d1d 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,15 +1,8 @@
-<h2>Forgot your password?</h2>
-
-<div class="span-12 colborder">
- <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= devise_error_messages! %>
-
- <div><%= f.label :email %><br />
- <%= f.email_field :email %></div>
-
- <div><%= f.submit "Send me reset password instructions", :class => "lbutton vm" %></div>
- <% end %>
-</div>
-<div>
- <%= render :partial => "devise/shared/links" %>
-</div>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :class => "login-box", :method => :post }) do |f| %>
+ <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
+ <%= devise_error_messages! %>
+ <%= f.email_field :email, :placeholder => "Email", :class => "text top" %>
+ <br/>
+ <%= f.submit "Reset password", :class => "grey-button" %>
+ <div class="right"> <%= render :partial => "devise/shared/links" %></div>
+<% end %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index c2c6562d01d..c17ff3f9914 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,7 +1,7 @@
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %>
<%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
- <%= f.text_field :email, :class => "text top" %>
- <%= f.password_field :password, :class => "text bottom" %>
+ <%= f.text_field :email, :class => "text top", :placeholder => "Email" %>
+ <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %>
<% if devise_mapping.rememberable? -%>
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>