From 28ee41961327b4296411cc5697e89bdaa77b37e1 Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sun, 14 Jul 2013 19:53:27 -0400 Subject: [PATCH 1/2] Layout updates Updates to password reset, settings and sign in pages --- views/password_reset.slim | 30 +++++++++++++++--------------- views/settings.slim | 10 +++++----- views/signin.slim | 11 +++++------ 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/views/password_reset.slim b/views/password_reset.slim index 91def705..b12c2f9a 100644 --- a/views/password_reset.slim +++ b/views/password_reset.slim @@ -1,15 +1,15 @@ -.text-center - .row - .span12 - h1 Reset Password - .row - .span6.offset3.text-center - h5 If you provided your e-mail you can reset your password. If you didn't, you will not be able to reset your password, you will need to create a new site. We will not change a password without an email entered, no exceptions. - .row - .span12 - form method="POST" action="/send_password_reset" - input name="csrf_token" type="hidden" value="#{csrf_token}" - - fieldset - div: input name="email" type="email" placeholder="Your email" - div: button class="btn btn-large btn-success" href="#" style="margin-top: 10px" Send Password Reset \ No newline at end of file +.txt-Center.content-Base + + h1 Reset Password + + h5 If you provided your e-mail you can reset your password. + h6 If you didn't, you will not be able to reset your password. + p You will need to create a new account. We will not change a password without an email entered, no exceptions. + + form method="POST" action="/send_password_reset" + + input name="csrf_token" type="hidden" value="#{csrf_token}" + + fieldset + input name="email" type="email" class="input-Area" placeholder="Your email" + button class="btn-Action" href="#" style="margin-top: 10px" Send Password Reset \ No newline at end of file diff --git a/views/settings.slim b/views/settings.slim index 65d9aae1..856b0008 100644 --- a/views/settings.slim +++ b/views/settings.slim @@ -18,15 +18,15 @@ div p Current Password: - input name="current_password" type="password" + input class="input-Area" name="current_password" type="password" div p New Password: - input name="new_password" type="password" + input class="input-Area" name="new_password" type="password" div p Confirm New Password: - input name="new_password_confirm" type="password" + input class="input-Area" name="new_password_confirm" type="password" input.btn-Action type="submit" value="Change Password" @@ -42,9 +42,9 @@ p Current name: #{current_site.username} p New name: - input name="name" type="text" placeholder="newname" + input name="name" class="input-Area" type="text" placeholder="newname" - input.btn-Action type="submit" value="Change Name" + input.btn-Action type="submit" value="Change Name" .col.col-33 .content diff --git a/views/signin.slim b/views/signin.slim index c96dc506..ec2128ac 100644 --- a/views/signin.slim +++ b/views/signin.slim @@ -2,18 +2,17 @@ .content.single-Col.txt-Center h1 Welcome back! - - form method="POST" action="/signin" + form method="POST" action="/signin" class="content" input name="csrf_token" type="hidden" value="#{csrf_token}" fieldset - div: input name="username" style="height:auto!important" type="text" placeholder="Your username" class="input-Area" autocapitalize="off" autocorrect="off" - div: input name="password" style="height:auto!important" type="password" class="input-Area" placeholder="Your password" - div: button class="btn-Action" href="#" Sign in + input name="username" type="text" placeholder="Your username" class="input-Area" autocapitalize="off" autocorrect="off" + input name="password" type="password" class="input-Area" placeholder="Your password" + button class="btn-Action" href="#" Sign in hr p a href="/new" title="Sign me up!" I don't have an account yet. p - a href="/password_reset" title="What did I huh?" I forgot my password. \ No newline at end of file + a href="/password_reset" title="What did I huh?" I forgot my password. From f245ae0a933c461b3251c714d25b636aacbc8f60 Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sun, 14 Jul 2013 20:02:55 -0400 Subject: [PATCH 2/2] little more clean up --- views/password_reset.slim | 4 +++- views/signin.slim | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/views/password_reset.slim b/views/password_reset.slim index b12c2f9a..8e8752c6 100644 --- a/views/password_reset.slim +++ b/views/password_reset.slim @@ -4,7 +4,8 @@ h5 If you provided your e-mail you can reset your password. h6 If you didn't, you will not be able to reset your password. - p You will need to create a new account. We will not change a password without an email entered, no exceptions. + p You will need to create a new account. + p We will not change a password without an email entered, no exceptions. form method="POST" action="/send_password_reset" @@ -12,4 +13,5 @@ fieldset input name="email" type="email" class="input-Area" placeholder="Your email" +
button class="btn-Action" href="#" style="margin-top: 10px" Send Password Reset \ No newline at end of file diff --git a/views/signin.slim b/views/signin.slim index ec2128ac..ef3031ca 100644 --- a/views/signin.slim +++ b/views/signin.slim @@ -7,7 +7,9 @@ fieldset input name="username" type="text" placeholder="Your username" class="input-Area" autocapitalize="off" autocorrect="off" + br input name="password" type="password" class="input-Area" placeholder="Your password" + br button class="btn-Action" href="#" Sign in hr