diff --git a/app/assets/stylesheets/boilerplate/main.css b/app/assets/stylesheets/boilerplate/main.css index 0258942..3fa40ca 100644 --- a/app/assets/stylesheets/boilerplate/main.css +++ b/app/assets/stylesheets/boilerplate/main.css @@ -94,10 +94,14 @@ textarea { ========================================================================== */ +.inline_div label{ + display: inline-block; + margin-bottom: 0 20px; +} - - - +.inline_div input[type='checkbox']{ + margin:0; +} diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 2a5435b..944d57d 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,19 +1,19 @@ <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> -
<%= f.label :email %>
- <%= f.email_field :email, :autofocus => true %>
+
<%= f.label :email %>
+ <%= f.email_field :email, :autofocus => true %>

-
<%= f.label :password %>
+
<%= f.label :password %> (forgot password)
<%= f.password_field :password %>
<% if devise_mapping.rememberable? -%> -
<%= f.check_box :remember_me %> <%= f.label :remember_me %>
+
<%= f.check_box :remember_me %> <%= f.label :remember_me %>
<% end -%> + +
<%= f.submit "Sign In", class: 'btn btn-primary' %> + <%= render "devise/shared/links" %>
-
<%= f.submit "Sign In", class: 'btn btn-primary' %>
-<% end %> - -<%= render "devise/shared/links" %> +<% end %> \ No newline at end of file diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb index 339cede..6971bc1 100644 --- a/app/views/devise/shared/_links.erb +++ b/app/views/devise/shared/_links.erb @@ -6,9 +6,9 @@ <%= link_to "Sign Up", new_registration_path(resource_name), class: 'btn btn-info' %> <% end -%> -<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-info' %> -- libgit2 0.21.2