This repository has been archived by the owner on Jul 29, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Created initial Sign In & Register pages, added more info to the header #5
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| <!DOCTYPE html> | ||
| <html class="no-js" lang="en"> | ||
|
|
||
| <!--#include virtual="includes/head.html" --> | ||
|
|
||
| <body> | ||
| <!--#include virtual="includes/header.html" --> | ||
| <div class="large-12 columns pnl-title pnl-summary"> | ||
| <h1>Register</h1> | ||
| <div class="large-8 row"> | ||
| <form id="sign-up" method="POST" action=""> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="fname">First name:</label> | ||
| <input type="text" name="fname" placeholder="First Name" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="sname">Surname name:</label> | ||
| <input type="text" name="sname" placeholder="Surname" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="email">Email:</label> | ||
| <input type="email" name="email" placeholder="Email" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="cemail">Confirm Email:</label> | ||
| <input type="email" name="cemail" placeholder="Confirm Email" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="phone">Telephone:</label> | ||
| <input type="tel" name="phone" placeholder="Telephone" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="country">Country:</label> | ||
| <input type="text" name="country" placeholder="Country" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="city">City:</label> | ||
| <input type="text" name="city" placeholder="City" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="postcode">Post Code:</label> | ||
| <input type="tel" name="phone" placeholder="Post Code" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="password">Password:</label> | ||
| <input type="tel" name="phone" placeholder="Password" required> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="cpassword">Confirm Password:</label> | ||
| <input type="password" name="cpassword" placeholder="Confirm Password"> | ||
| </div> | ||
| <div class="small-12 large-6 column"> | ||
| <label for="position">Current Position:</label> | ||
| <input type="text" name="city" placeholder="Current Position" required> | ||
| </div> | ||
| <div class="small-12 large-12 column inline-select"> | ||
| <label>I am a:</label> | ||
| <select name="usertype"> | ||
| <option value="cause" selected>Marketer</option> | ||
| <option value="marketer">Cause</option> | ||
| </select> | ||
| </div> | ||
| <div class="small-12 large-12 column inline-select"> | ||
| <label><input type="checkbox" name="terms" checked="checked"> I agree to the terms & conditions</label> | ||
| </div> | ||
| <div class="small-12 large-12 column"> | ||
| <input class="button left" type="submit" value="Submit"> | ||
| </div> | ||
|
|
||
| </form> | ||
| </div> | ||
| </div> | ||
|
|
||
| <!--#include virtual="includes/footer.html" --> | ||
|
|
||
| <!--#include virtual="includes/mobile-menu-end.html" --> | ||
|
|
||
| <!--#include virtual="includes/foot.html" --> | ||
|
|
||
| </body> | ||
| </html> | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -256,7 +256,6 @@ <h1>Sign-up to our newsletter</h1> | |
| <!--#include virtual="includes/foot.html" --> | ||
|
|
||
| </body> | ||
|
|
||
| </html> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <!DOCTYPE html> | ||
| <html class="no-js" lang="en"> | ||
|
|
||
| <!--#include virtual="includes/head.html" --> | ||
|
|
||
| <body> | ||
| <!--#include virtual="includes/header.html" --> | ||
| <div class="large-12 columns pnl-title pnl-summary"> | ||
| <h1>Log In</h1> | ||
| <form id="sign-in" method="POST" action="" class="large-4 row"> | ||
| <label for="email">Email:</label> | ||
| <input type="email" name="email" placeholder="Username" required> | ||
| <label for="password">Password:</label> | ||
| <input type="password" name="password" placeholder="Password"> | ||
| <a href="#" class="row">Forgot Password</a> | ||
| <input class="button right" type="submit" value="Sign in"> | ||
| <a href="create-account.html" class="underline row txt-right">Not Registered? Start here</a> | ||
| </form> | ||
|
|
||
| </div> | ||
|
|
||
| <!--#include virtual="includes/footer.html" --> | ||
|
|
||
| <!--#include virtual="includes/mobile-menu-end.html" --> | ||
|
|
||
| <!--#include virtual="includes/foot.html" --> | ||
|
|
||
| </body> | ||
| </html> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,3 +16,6 @@ | |
| // padding-top: rem-calc(24.4); | ||
| //} | ||
|
|
||
| .underline { | ||
| text-decoration: underline; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,33 @@ | ||
| /* ================================= | ||
| LAYOUT / FORMS | ||
| ================================= */ | ||
| ================================= */ | ||
|
|
||
| #sign-in, #sign-up { | ||
| margin: 0 auto; | ||
| label { | ||
| display: none; | ||
| } | ||
| a { | ||
| color: $colr-txt-dark; | ||
| display: block; | ||
| margin: 0; | ||
| } | ||
| .txt-right { | ||
| text-align: right; | ||
| clear: both; | ||
| } | ||
| } | ||
|
|
||
| #sign-up { | ||
| .inline-select { | ||
| display: inline-block; | ||
| label { | ||
| display: inline-block; | ||
| } | ||
| select { | ||
| width: auto; | ||
| min-width: 7em; | ||
| } | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you change the placeholder to
Email Address? Just to make it explicitly clear it's the email address the user should enterThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tanyapowell I followed the wireframe exactly, I will check with Jeanette if that is OK as it is a visual change too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's cool! I had a conversation with my dad at lunchtime about filling in an online form and made me realise how important it is to be ridiculously clear on what you are asking for