Merge pull request rubyforgood#1349 from rubyforgood/reset_password_s…

…tyling Fix the styling issue on the reset password page.
Rockenfels · Nov 16, 2020 · 01c50b3 · 01c50b3
2 parents 9101883 + 9ec3a46
commit 01c50b3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/app/javascript/src/stylesheets/pages/login.scss b/app/javascript/src/stylesheets/pages/login.scss
@@ -1,4 +1,4 @@
-body.devise-sessions-new, body.users-sessions-new {
+body.devise-sessions-new, body.users-sessions-new, body.devise-passwords-new {
   .container {
     max-width: none;
   }

diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
@@ -1,20 +1,34 @@
-<h2>Forgot your password?</h2>
-
 <div class="row">
-  <div class="col-sm-6">
-    <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-      <%= render "/shared/error_messages", resource: resource %>
+  <div class="col-lg-5 col-md-12 vertically-center">
+    <div class="container">
+      <div class="row">
+        <div class="offset-xl-2 col-xl-8 col-lg-12 col-sm-8 col-md-8">
+          <br>
+          <h2>Forgot your password?</h2>
+          <br>
 
-      <div class="field form-group">
-        <%= f.label :email %><br>
-        <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control" %>
-      </div>
+          <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+            <%= render "/shared/error_messages", resource: resource %>
+
+            <div class="field form-group">
+              <%= f.label :email %><br>
+              <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control" %>
+            </div>
 
-      <div class="actions">
-        <%= f.submit "Send me reset password instructions", class: "btn btn-primary" %>
+            <div class="actions">
+              <%= f.submit "Send me reset password instructions", class: "btn btn-primary" %>
+            </div>
+          <% end %>
+
+          <br>
+          <%= render "devise/shared/links" %>
+          <br>
+        </div>
       </div>
-    <% end %>
+    </div>
+  </div>
+
+  <div class="col-lg-7 d-none d-lg-block">
+    <aside class="display-image"></aside>
   </div>
 </div>
-<br>
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
@@ -1,5 +1,5 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Log in", new_session_path(resource_name) %><br>
+  <%= link_to "Log in", new_session_path(resource_name), class: "btn btn-info" %><br>
 <% end %>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>