From 10f1b5abdeacfbcf99aeb0f161b9101802cc4fa2 Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Wed, 11 Dec 2013 19:05:16 -0500 Subject: [PATCH] Login redesign, saved ios7 login just in case --- public/css/styles.less | 31 ++++++++++++++++++ views/login-ios.jade | 51 ++++++++++++++++++++++++++++++ views/login.jade | 71 +++++++++++++++++------------------------- 3 files changed, 111 insertions(+), 42 deletions(-) create mode 100644 views/login-ios.jade diff --git a/public/css/styles.less b/public/css/styles.less index 6fa05735821..68caf38bdba 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -14,4 +14,35 @@ body { margin-bottom: -15px; position: relative; left: -10px; +} + +.form-signin { + max-width: 400px; + display: block; +} + +[class^="fa-"], +[class*="fa-"] { + margin-right: 5px; +} + + +.facebook { + background-color: #335397; + border-color: #335397; +} + +.twitter { + background-color: #00c7f7; + border-color: #00c7f7; +} + +.google { + background-color: #dd4b39; + border-color: #dd4b39; +} + +.github { + background-color: #333; + border-color: #333; } \ No newline at end of file diff --git a/views/login-ios.jade b/views/login-ios.jade new file mode 100644 index 00000000000..fb42ab58d2d --- /dev/null +++ b/views/login-ios.jade @@ -0,0 +1,51 @@ +extends layout + +block content + if messages.length + .alert.alert-danger + strong= messages + .login-container.animated.fadeIn + h3.text-center + span.text-primary PROJECT + span.text-muted NAME + form(method='POST') + .form-group + input.form-control(type='text', name='username', id='username', placeholder='Email', autofocus='', required='') + .form-group + input.form-control(type='password', name='password', id='password', placeholder='Password', required='') + button(type='submit') + i.fa.fa-chevron-right + .form-options.clearfix + a.pull-right(href='#') Forgot password? + .text-left + label.checkbox + input(type='checkbox') + span Remember me + .row + .col-xs-6.col-sm-6.col-md-6 + a.btn.btn-primary.btn-block.facebook(href='/auth/facebook') + i.fa.fa-facebook + | Facebook + + .col-xs-6.col-sm-6.col-md-6 + a.btn.btn-info.btn-block.twitter(href='/auth/twitter') + i.fa.fa-twitter + |   Twitter + + .row + .col-xs-6.col-sm-6.col-md-6 + a.btn.btn-danger.btn-block.google(href='/auth/google') + i.fa.fa-google-plus + |   Google + .col-xs-6.col-sm-6.col-md-6 + a.btn.btn-default.btn-block.github(href='/auth/github') + i.fa.fa-github + |   GitHub + p Don't have an account yet?  + a(href='/signup') Sign up now + + script + $(function() { + $('.navbar').remove(); + $('body').addClass('login-body'); + }); \ No newline at end of file diff --git a/views/login.jade b/views/login.jade index fb42ab58d2d..e081efdc5b7 100644 --- a/views/login.jade +++ b/views/login.jade @@ -4,48 +4,35 @@ block content if messages.length .alert.alert-danger strong= messages - .login-container.animated.fadeIn - h3.text-center - span.text-primary PROJECT - span.text-muted NAME - form(method='POST') - .form-group + .page-header + h2 Login + form.form-horizontal(method='POST') + .form-group + .col-sm-offset-2.col-sm-8 + .btn-group.btn-group-justified + a.btn.btn-sm.btn-primary.facebook(href='/auth/facebook') + i.fa.fa-facebook + | Facebook + a.btn.btn-sm.btn-info.twitter(href='/auth/twitter') + i.fa.fa-twitter + | Twitter + a.btn.btn-sm.btn-danger.google(href='/auth/google') + i.fa.fa-google-plus + | Google + a.btn.btn-sm.btn-default.github(href='/auth/github') + i.fa.fa-github + | GitHub + .form-group + label.col-sm-2.control-label(for='username') Email + .col-sm-8 input.form-control(type='text', name='username', id='username', placeholder='Email', autofocus='', required='') - .form-group + .form-group + label.col-sm-2.control-label(for='username') Password + .col-sm-8 input.form-control(type='password', name='password', id='password', placeholder='Password', required='') - button(type='submit') - i.fa.fa-chevron-right - .form-options.clearfix - a.pull-right(href='#') Forgot password? - .text-left - label.checkbox - input(type='checkbox') - span Remember me - .row - .col-xs-6.col-sm-6.col-md-6 - a.btn.btn-primary.btn-block.facebook(href='/auth/facebook') - i.fa.fa-facebook - | Facebook + .help-block + a.pull-right(href='#') Forgot password? + .form-group + .col-sm-offset-2.col-sm-8 + button.btn.btn-success(type='submit') Login - .col-xs-6.col-sm-6.col-md-6 - a.btn.btn-info.btn-block.twitter(href='/auth/twitter') - i.fa.fa-twitter - |   Twitter - - .row - .col-xs-6.col-sm-6.col-md-6 - a.btn.btn-danger.btn-block.google(href='/auth/google') - i.fa.fa-google-plus - |   Google - .col-xs-6.col-sm-6.col-md-6 - a.btn.btn-default.btn-block.github(href='/auth/github') - i.fa.fa-github - |   GitHub - p Don't have an account yet?  - a(href='/signup') Sign up now - - script - $(function() { - $('.navbar').remove(); - $('body').addClass('login-body'); - }); \ No newline at end of file