diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index b38d471..408c0f6 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -14,7 +14,6 @@ $carousel-indicator-active-bg: #333; @import "bootstrap"; @import "bootstrap/theme"; -@import 'font-awesome'; @import "active_scaffold"; @import "theme/*"; @import "pages/*"; diff --git a/app/assets/stylesheets/pages/home.css.scss b/app/assets/stylesheets/pages/home.css.scss index 8f57f47..9065b03 100644 --- a/app/assets/stylesheets/pages/home.css.scss +++ b/app/assets/stylesheets/pages/home.css.scss @@ -1,13 +1,12 @@ @import "compass/css3/images"; @import "compass/css3/border-radius"; -.contour { - border: 2px solid $text-color; - padding: 1em; - @include border-radius($border-radius-large); - br.hide { - display: block !important; - visibility: visible !important; +.home-sign-up { + h3 { + margin-top: 0; + } + .actions { + margin-top: 2em; } } diff --git a/app/views/public/pages/home.html.erb b/app/views/public/pages/home.html.erb index 089714a..b8be943 100644 --- a/app/views/public/pages/home.html.erb +++ b/app/views/public/pages/home.html.erb @@ -12,32 +12,15 @@
-
-
-

Use it yourself, it's free!

-

In a few seconds you're done!

-
- <%= simple_form_for(resource, - as: resource_name, - url: registration_path(resource_name), - wrapper: :inlabel - ) do |f| %> - <%= devise_error_messages! %> - <%= honeypot %> - <%= f.input :full_name, required: true %> - <%= f.input :email, required: true %> - <%= f.input :password, required: true %> -
- <%= f.submit "Sign up", class: 'btn btn-primary' %> - - or <%= link_to 'Sign in', new_user_session_path %> - / <%= link_to 'Forgot your password?', new_password_path(resource_name) %> - - <% end %> -
+ -
+
<%= render 'public/pages/home/slides' %>
diff --git a/app/views/users/registrations/_new.html.erb b/app/views/users/registrations/_new.html.erb index e6f77d7..a322482 100644 --- a/app/views/users/registrations/_new.html.erb +++ b/app/views/users/registrations/_new.html.erb @@ -1,7 +1,12 @@ -<%= simple_form_for(resource, +<% + options = { as: resource_name, url: registration_path(resource_name) - ) do |f| %> + } + options[:wrapper] = wrapper if defined? wrapper +%> + +<%= simple_form_for(resource, options) do |f| %> <%= devise_error_messages! %> @@ -9,9 +14,11 @@ <%= f.input :full_name, required: true %> <%= f.input :email, required: true %> <%= f.input :password, required: true %> - <%= f.submit "Sign up", class: 'btn btn-primary' %> - - or <%= link_to 'Sign in', new_user_session_path %> - / <%= link_to 'Forgot your password?', new_password_path(resource_name) %> - -<% end %> \ No newline at end of file +
+ <%= f.submit "Sign up", class: 'btn btn-primary' %> + + or <%= link_to 'Sign in', new_user_session_path %> + / <%= link_to 'Forgot your password?', new_password_path(resource_name) %> + +
+<% end %>