-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Mailchimp Signup Flow #51
Merged
Merged
Changes from all commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
d0e49ee
Add create account button to login screen.
iamdharmesh 69f6bfe
Add initial create account markup.
iamdharmesh 47fc199
Added form validation and form submission handling.
iamdharmesh 9013bce
Completed intial create account flow.
iamdharmesh 2d3089f
Remove waiting for login option on logout.
iamdharmesh 3ec4ec7
- Moved CSS and JS to assets folder and added Means web fonts for cre…
iamdharmesh 676365c
PHPCS fixes.
iamdharmesh 907573a
Update wizard steps to reflect current step.
iamdharmesh 3220e61
Add address 2 data as well.
iamdharmesh 3200f54
Remove unwanted code.
iamdharmesh 316b214
Merge branch 'develop' of github.com:mailchimp/wordpress into enhance…
iamdharmesh f57605f
Add basic E2E tests.
iamdharmesh 435e10c
Apply suggestions from code review
iamdharmesh da72685
Remove hardcoded fallback string.
iamdharmesh f77a82b
Merge branch 'develop' into enhancement/46
dkotter dc327f2
Added Graphik web fonts.
iamdharmesh 240f130
Create account page design updates.
iamdharmesh 2e21c4a
Update design of confirm email page.
iamdharmesh 6f467aa
Update designs for suggest to login.
iamdharmesh 6964674
Include country in validation check.
iamdharmesh b4e2da9
Break down account page in templates and CSS updates.
iamdharmesh 9603cda
Combined CSS into single file.
iamdharmesh 9549795
Update CSS to use var for color.
iamdharmesh 28b95a1
Add retry with different email address functionality.
iamdharmesh 5702291
Updated main settings page header and connect button designs.
iamdharmesh b833832
Updates in setup_page.php to handle only logged user.
iamdharmesh f4eb23e
Background color update for main settings page.
iamdharmesh a8a6cf9
E2E test updates.
iamdharmesh 2b2b7dd
Update error color to match Mailchimp design.
iamdharmesh 1211cbc
Update blocked popup design to match new design.
iamdharmesh f7411a8
Update wordings as per PR feedback
iamdharmesh 7c3664a
Trigger oauth process from suggest to login page.
iamdharmesh d7271f0
Update terms wordings.
iamdharmesh c7634c4
Formatting updates for setup_page.php
iamdharmesh 2129c14
Update button styles.
iamdharmesh ae2a2df
Update header title for signup flow pages.
iamdharmesh 561fd35
Remove extra line.
iamdharmesh 4464b74
Hide timezone field.
iamdharmesh eea7826
Fix spacing issue.
iamdharmesh 960e44a
"Log in" button wording updates and footer text updates.
iamdharmesh bc5e682
Remove exra trailing comma.
iamdharmesh a28b1ca
Display notice to users to activate account incase they access settin…
iamdharmesh 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
Large diffs are not rendered by default.
Oops, something went wrong.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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,132 @@ | ||
| /* | ||
| This font software is the property of Commercial Type. | ||
|
|
||
| You may not modify the font software, use it on another website, or install it on a computer. | ||
|
|
||
| License information is available at http://commercialtype.com/eula | ||
| For more information please visit Commercial Type at http://commercialtype.com or email us at info[at]commercialtype.com | ||
|
|
||
| Copyright (C) 2016 Schwartzco Inc. | ||
|
|
||
| */ | ||
|
|
||
|
|
||
| .Means-Light-Web { | ||
| font-family: "Means Web"; | ||
| font-weight: 300; | ||
| font-style: normal; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| .Means-LightItalic-Web { | ||
| font-family: "Means Web"; | ||
| font-weight: 300; | ||
| font-style: italic; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| .Means-Regular-Web { | ||
| font-family: "Means Web"; | ||
| font-weight: 400; | ||
| font-style: normal; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| .Means-RegularItalic-Web { | ||
| font-family: "Means Web"; | ||
| font-weight: 400; | ||
| font-style: italic; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| .Means-Medium-Web { | ||
| font-family: "Means Web"; | ||
| font-weight: 500; | ||
| font-style: normal; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| .Means-MediumItalic-Web { | ||
| font-family: "Means Web"; | ||
| font-weight: 500; | ||
| font-style: italic; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| .Means-Bold-Web { | ||
| font-family: "Means Web"; | ||
| font-weight: 700; | ||
| font-style: normal; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| .Means-BoldItalic-Web { | ||
| font-family: "Means Web"; | ||
| font-weight: 700; | ||
| font-style: italic; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: "Means Web"; | ||
| src: url("Means-Light-Web.woff2") format("woff2"), | ||
| url("Means-Light-Web.woff") format("woff"); | ||
| font-weight: 300; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: "Means Web"; | ||
| src: url("Means-LightItalic-Web.woff2") format("woff2"), | ||
| url("Means-LightItalic-Web.woff") format("woff"); | ||
| font-weight: 300; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: "Means Web"; | ||
| src: url("Means-Regular-Web.woff2") format("woff2"), | ||
| url("Means-Regular-Web.woff") format("woff"); | ||
| font-weight: 400; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: "Means Web"; | ||
| src: url("Means-RegularItalic-Web.woff2") format("woff2"), | ||
| url("Means-RegularItalic-Web.woff") format("woff"); | ||
| font-weight: 400; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: "Means Web"; | ||
| src: url("Means-Medium-Web.woff2") format("woff2"), | ||
| url("Means-Medium-Web.woff") format("woff"); | ||
| font-weight: 500; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: "Means Web"; | ||
| src: url("Means-MediumItalic-Web.woff2") format("woff2"), | ||
| url("Means-MediumItalic-Web.woff") format("woff"); | ||
| font-weight: 500; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: "Means Web"; | ||
| src: url("Means-Bold-Web.woff2") format("woff2"), | ||
| url("Means-Bold-Web.woff") format("woff"); | ||
| font-weight: 700; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: "Means Web"; | ||
| src: url("Means-BoldItalic-Web.woff2") format("woff2"), | ||
| url("Means-BoldItalic-Web.woff") format("woff"); | ||
| font-weight: 700; | ||
| font-style: italic; | ||
| } | ||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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,263 @@ | ||
| /* | ||
| This font software is the property of Commercial Type. | ||
|
|
||
| You may not modify the font software, use it on another website, or install it on a computer. | ||
|
|
||
| License information is available at http://commercialtype.com/eula | ||
| For more information please visit Commercial Type at http://commercialtype.com or email us at info[at]commercialtype.com | ||
|
|
||
| Copyright (C) 2016 Schwartzco Inc. | ||
|
|
||
| */ | ||
|
|
||
| .GraphikMailchimp-Thin-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 100; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-ThinItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 100; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .GraphikMailchimp-Extralight-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 200; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-ExtralightItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 200; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .GraphikMailchimp-Light-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 300; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-LightItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 300; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .GraphikMailchimp-Regular-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 400; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-RegularItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 400; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .GraphikMailchimp-Medium-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 500; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-MediumItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 500; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .GraphikMailchimp-Semibold-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 600; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-SemiboldItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 600; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .GraphikMailchimp-Bold-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 700; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-BoldItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 700; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .GraphikMailchimp-Black-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 800; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-BlackItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 800; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .GraphikMailchimp-Super-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 900; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .GraphikMailchimp-SuperItalic-Web { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| font-weight: 900; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Thin-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Thin-Web.woff') format('woff'); | ||
| font-weight: 100; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-ThinItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-ThinItalic-Web.woff') format('woff'); | ||
| font-weight: 100; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Extralight-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Extralight-Web.woff') format('woff'); | ||
| font-weight: 200; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-ExtralightItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-ExtralightItalic-Web.woff') format('woff'); | ||
| font-weight: 200; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Light-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Light-Web.woff') format('woff'); | ||
| font-weight: 300; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-LightItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-LightItalic-Web.woff') format('woff'); | ||
| font-weight: 300; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Regular-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Regular-Web.woff') format('woff'); | ||
| font-weight: 400; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-RegularItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-RegularItalic-Web.woff') format('woff'); | ||
| font-weight: 400; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Medium-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Medium-Web.woff') format('woff'); | ||
| font-weight: 500; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-MediumItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-MediumItalic-Web.woff') format('woff'); | ||
| font-weight: 500; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Semibold-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Semibold-Web.woff') format('woff'); | ||
| font-weight: 600; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-SemiboldItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-SemiboldItalic-Web.woff') format('woff'); | ||
| font-weight: 600; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Bold-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Bold-Web.woff') format('woff'); | ||
| font-weight: 700; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-BoldItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-BoldItalic-Web.woff') format('woff'); | ||
| font-weight: 700; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Black-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Black-Web.woff') format('woff'); | ||
| font-weight: 800; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-BlackItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-BlackItalic-Web.woff') format('woff'); | ||
| font-weight: 800; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-Super-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-Super-Web.woff') format('woff'); | ||
| font-weight: 900; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'Graphik Mailchimp Web'; | ||
| src: url('GraphikMailchimp-SuperItalic-Web.woff2') format('woff2'), | ||
| url('GraphikMailchimp-SuperItalic-Web.woff') format('woff'); | ||
| font-weight: 900; | ||
| font-style: italic; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
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.
Not sure if we can use this font in this plugin. Got these font files from the "Mailchimp for WooCommerce" plugin.
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.
Looking at their design guidelines, they say:
This seems to imply we are safe to use this font but is a question we should ask them cc / @jeffpaul
The notice in this file mentions Commercial Type. Looking at their website, they do list Mailchimp as a client so I'm assuming they are the ones that built this font for Mailchimp
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.
Update: We have now included "Graphik" fonts as well to match Figma designs.