diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index f23eb96..8bf2bf8 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -102,3 +102,9 @@ footer ul li { width: 100%; margin-top: 30px; } + +.form-field{ + margin-bottom: 15px; + text-align: bottom; + +} diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss index ddc2ba5..6a2d220 100644 --- a/app/assets/stylesheets/users.css.scss +++ b/app/assets/stylesheets/users.css.scss @@ -3,6 +3,16 @@ // You can use Sass (SCSS) here: http://sass-lang.com/ +//signin +.sign-in{ + .checkbox label{ + padding-left: 0px; + } + #user_remember_me{ + margin-left: 10px; + } +} + .users .thumbnail { padding: 0px; min-height: 280px; @@ -37,11 +47,6 @@ background-color: #f5f5dc; } - - - - - /* sidebar */ aside { diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index bc6674d..3396d7e 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,16 +1,18 @@

Sign in

Partners sign in using the link sent by email.
+
+ <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> -<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> + <%= form_text_field f, :nickname %> + <%= form_password_field f, :password %> - <%= form_text_field f, :nickname %> - <%= form_password_field f, :password %> + <% if devise_mapping.rememberable? %> + <%= form_check_box f, :remember_me %> + <% end %> - <% if devise_mapping.rememberable? %> - <%= form_check_box f, :remember_me %> + <%= f.submit "Sign in", class: "btn btn-primary" %> <% end %> +
- <%= f.submit "Sign in", class: "btn btn-primary" %> -<% end %> <%= render "devise/shared/links" %> diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb index 8a13796..77706ce 100644 --- a/app/views/products/_form.html.erb +++ b/app/views/products/_form.html.erb @@ -1,15 +1,15 @@
-
+