From 5fef9092adba740bbff59ea3cf2569e925e2d98c Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Wed, 5 Mar 2014 16:41:42 -0500 Subject: [PATCH] Placed single sign-in buttons at the bottom of the login form --- public/css/styles.less | 4 ++-- views/account/login.jade | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/public/css/styles.less b/public/css/styles.less index e816435690..2a3d854090 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -5,7 +5,7 @@ @import "themes/default"; // Scaffolding -// ---- --------------------- +// ------------------------- html, body { height: 100%; @@ -22,7 +22,7 @@ body { /* Negative indent footer by its height */ margin: 0 auto -110px; /* Pad bottom by footer height + (optional) extra spacing */ - padding: 0 0 120px; + padding: 0 0 140px; } #footer { diff --git a/views/account/login.jade b/views/account/login.jade index 068bed1c74..2713f43fd2 100644 --- a/views/account/login.jade +++ b/views/account/login.jade @@ -5,7 +5,20 @@ block content legend Sign In input(type='hidden', name='_csrf', value=token) .row - .col-sm-4 + .col-sm-8.col-sm-offset-2 + if secrets.localAuth + .form-group + label.control-label(for='email') Email + input.form-control(type='text', name='email', id='email', placeholder='Email', autofocus=true) + .form-group + label.control-label(for='password') Password + input.form-control(type='password', name='password', id='password', placeholder='Password') + .form-group + button.btn.btn-primary(type='submit') + i.fa.fa-unlock-alt + | Login + a.btn.btn-link(href='/forgot') Forgot your password? + hr if secrets.facebookAuth a.btn.btn-block.btn-facebook.btn-social(href='/auth/facebook') i.fa.fa-facebook @@ -25,17 +38,4 @@ block content if secrets.linkedinAuth a.btn.btn-block.btn-linkedin.btn-social(href='/auth/linkedin') i.fa.fa-linkedin - | Sign in with LinkedIn - if secrets.localAuth - .col-sm-8 - .form-group - label.control-label(for='email') Email - input.form-control(type='text', name='email', id='email', placeholder='Email', autofocus=true) - .form-group - label.control-label(for='password') Password - input.form-control(type='password', name='password', id='password', placeholder='Password') - .form-group - button.btn.btn-primary(type='submit') - i.fa.fa-unlock-alt - | Login - a.btn.btn-link(href='/forgot') Forgot your password? + | Sign in with LinkedIn \ No newline at end of file