Merge branch 'master' of github.com:tosdr/phoenix into production

tosdr · Nov 23, 2017 · b2674e1 · b2674e1
2 parents 078ddd8 + 689a83d
commit b2674e1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/app/assets/stylesheets/pages/_devise.scss b/app/assets/stylesheets/pages/_devise.scss
@@ -0,0 +1,3 @@
+.mwd {
+  width: 400px;
+}
diff --git a/app/assets/stylesheets/pages/_index.scss b/app/assets/stylesheets/pages/_index.scss
@@ -3,6 +3,7 @@
 @import "point";
 @import "topic";
 @import "about";
+@import "devise";
 
 body {
   padding-top: 70px;

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -1,3 +1,5 @@
+<div class="container mwd">
+
 <h2>Sign up</h2>
 
 <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
@@ -16,3 +18,5 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
+
+</div>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container mwd">
   <div class="row">
 
     <h2>Log in</h2>