Merge

EthanZeigler · Mar 1, 2020 · 7581472 · 7581472
1 parent ac8537d
commit 7581472
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/app.yaml b/app.yaml
@@ -0,0 +1,6 @@
+entrypoint: bundle exec rails server --port $PORT
+env: flex
+runtime: ruby
+
+env_variables:
+  SECRET_KEY_BASE: ab3f43f7b209cbd490bbf473a861fb438d22a44248ea487996b49e1338ea7552496961443d3ddcdf0ee045ef3c8faebc619ad60ae1ff08c68f67e41b68334a0a
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -1,27 +1,28 @@
-<div class="container"><h2>Log in</h2>
+<div class="container d-flex flex-column justify-content-center align-items-center mt-5">
+  <h2>Log in</h2>
 
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-  </div>
+  <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+    <div class="field">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, class: "form-control", autofocus: true, autocomplete: "email" %>
+    </div>
+
+    <div class="field pt-3">
+      <%= f.label :password %><br />
+      <%= f.password_field :password, class: "form-control", autocomplete: "current-password" %>
+    </div>
 
-  <div class="field">
-    <%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "current-password" %>
-  </div>
+    <% if devise_mapping.rememberable? %>
+      <div class="field py-3">
+        <%= f.check_box :remember_me %>
+        <%= f.label :remember_me %>
+      </div>
+    <% end %>
 
-  <% if devise_mapping.rememberable? %>
-    <div class="field">
-      <%= f.check_box :remember_me %>
-      <%= f.label :remember_me %>
+    <div class="actions mb-4">
+      <%= f.submit "Log in", class: "btn btn-primary" %>
     </div>
   <% end %>
 
-  <div class="actions">
-    <%= f.submit "Log in" %>
-  </div>
-<% end %>
-
-<%= render "devise/shared/links" %>
+  <%= render "devise/shared/links" %>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -19,7 +19,7 @@
 
 <body>
 <%# Navigation Bar %>
-<nav class="navbar navbar-expand-md navbar-light bg-light">
+<nav class="navbar navbar-expand-md navbar-dark bg-primary">
   <a class="navbar-brand" href="/">Inclusive Access</a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
           aria-expanded="false" aria-label="Toggle navigation">
@@ -64,7 +64,7 @@
         </li>
       <% else %>
         <li class="nav-item">
-          <%= button_to "Login", new_user_session_path, class: "btn btn-outline-primary" %>
+          <%= button_to "Login", new_user_session_path, class: "btn btn-outline-light" %>
         </li>
       <% end %>
     </ul>

diff --git a/public/.DS_Store b/public/.DS_Store