Merge branch 'fix-issues' into 'master'

Fix layout from new password, and edit password (Fix #40)



See merge request !232

app/views/devise/passwords/edit.html.erb

-<h2>Mudar sua senha</h2>
+<div class="container">
+  <div class="row">
+    <div class=" col-md-12">
+      <div class="white-input">
+        <div class="grey-panel">
+          <h2>Mudar sua senha</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
-  <%= f.hidden_field :reset_password_token %>
+          <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+            <%= devise_error_messages! %>
+            <%= f.hidden_field :reset_password_token %>
 
-  <div class="field">
-    <%= f.label :password, "Nova Senha" %><br />
-    <% if @minimum_password_length %>
-      <em>(<%= @minimum_password_length %> caracteres no mínimo)</em><br />
-    <% end %>
-    <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
-  </div>
 
-  <div class="field">
-    <%= f.label :password_confirmation, "Confirme a nova senha" %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
+            <table style="margin: 20px auto;">
+              <tr>
+                <td>Nova Senha:</td>
+                <td>&nbsp;&nbsp;</td>
+                <td style=" padding: 10px;">
+                  <%= f.password_field :password, autofocus: true, autocomplete: "off", style: "width:375px;" %>
 
-  <div class="actions">
-    <%= f.submit "Mudar minha senha" %>
-  </div>
-<% end %>
+                </td>
+              </tr>
 
-<%= render "devise/shared/links" %>
+              <tr>
+                <td>Confirme a nova senha:</td>
+                <td>&nbsp;&nbsp;</td>
+                <td style=" padding: 10px;">
+                  <%= f.password_field :password_confirmation, autocomplete: "off" , style: "width:375px;" %>
+                </td>
+              </tr>
+            </table>
+
+            <div class="actions">
+              <%= f.submit "Mudar minha senha", class:"btn btn-md btn-primary" %>
+            </div>
+          <% end %>
+          </br>
+          </br>
+          <%= render "devise/shared/links" %>
+        </div>
+      </div>
+    </div>
+  </div>
+  </div>

app/views/devise/passwords/new.html.erb

-<h2>Esqueceu sua senha?</h2>
+<div class="container">
+  <div class="row">
+    <div class=" col-md-12">
+      <div class="white-input">
+        <div class="grey-panel">
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
+        <h2>Esqueceu sua senha?</h2>
+        <br/>
+        <%= image_tag image_path('user-anon.png'), class: "logo" %><br/><br/>
 
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
-  </div>
+        <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+          <%= devise_error_messages! %>
+
+
+          <table style="margin: 20px auto;">
+            <tr>
+              <td>Email:</td>
+              <td>&nbsp;&nbsp;</td>
+              <td style=" padding: 10px;">
+                <%= f.email_field :email, autofocus: true, style: "width:375px;" %>
+              </td>
+            </tr>
+          </table>
 
-  <div class="actions">
-    <%= f.submit "Envie-me instruções para atualizar a senha" %>
-  </div>
-<% end %>
 
-<%= render "devise/shared/links" %>
+          <div class="actions">
+            <%= f.submit "Envie-me instruções para atualizar a senha", class: "btn btn-md btn-primary"%>
+          </div>
+        <% end %>
+
+        </br>
+        </br>
+
+        <%= render "devise/shared/links" %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>