From f02f2ae77ee974b82fcbcce334b5a51728a1ff9c Mon Sep 17 00:00:00 2001 From: Skud Date: Mon, 11 Aug 2014 14:49:05 +1000 Subject: [PATCH] b3ify the signup/signin pages --- app/views/devise/registrations/new.html.haml | 31 +++++++++++--------- app/views/devise/sessions/new.html.haml | 22 ++++++++------ 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index e9eb59bd5..268fc3e45 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -6,39 +6,42 @@ = devise_error_messages! .form-group - = f.label :login_name, :class => "control-label" - .controls - = f.text_field :login_name + = f.label :login_name, :class => "control-label col-md-2" + .col-md-8 + = f.text_field :login_name, :class => 'form-control' %span.help-inline This is the name that will show on the website. .form-group - = f.label :email, :class => "control-label" - .controls - = f.email_field :email + = f.label :email, :class => "control-label col-md-2" + .col-md-8 + = f.email_field :email, :class => 'form-control' %span.help-inline We'll use this address to contact you (we never spam!) .form-group - = f.label :password, :class => "control-label" - .controls= f.password_field :password + = f.label :password, :class => "control-label col-md-2" + .col-md-8= f.password_field :password, :class => 'form-control' .form-group - = f.label :password_confirmation, :class => "control-label" - .controls= f.password_field :password_confirmation + = f.label :password_confirmation, :class => "control-label col-md-2" + .col-md-8= f.password_field :password_confirmation, :class => 'form-control' .form-group - .controls + .col-md-offset-2.col-md-8 = f.check_box :tos_agreement I agree to the = succeed "." do = link_to 'Terms of Service', url_for(:action => 'tos', :controller => '/policy') .form-group - .controls + .col-md-offset-2.col-md-8 = f.check_box :newsletter, :checked => true Subscribe to the #{ENV['GROWSTUFF_SITE_NAME']} newsletter .help-inline = render :partial => 'newsletter_blurb' - .form-actions + .form-group + .form-actions.col-md-offset-2.col-md-8 = f.submit "Sign up", :class => 'btn btn-primary' -= render "devise/shared/links" + .form-group + .col-md-offset-2.col-md-8 + = render "devise/shared/links" diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index bb3b0b8ff..51d7b6845 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -4,21 +4,25 @@ = devise_error_messages! .form-group - = f.label :login, :class => "control-label" - .controls= f.text_field :login + = f.label :login, :class => "control-label col-md-2" + .col-md-8 + = f.text_field :login, :class => 'form-control' .form-group - = f.label :password, :class => "control-label" - .controls= f.password_field :password + = f.label :password, :class => "control-label col-md-2" + .col-md-8 + = f.password_field :password, :class => 'form-control' - if devise_mapping.rememberable? .form-group - .controls + .col-md-8.col-md-offset-2 = f.check_box :remember_me Remember me - .form-actions - = f.submit "Sign in", :class => 'btn btn-primary' + .form-group + .form-actions.col-md-8.col-md-offset-2 + = f.submit "Sign in", :class => 'btn btn-primary' - -= render "devise/shared/links" + .form-group + .col-md-8.col-md-offset-2 + = render "devise/shared/links"