Skip to content
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

make the modal mostly its own thing #2254

Merged
merged 16 commits into from
Nov 22, 2018
Merged

make the modal mostly its own thing #2254

merged 16 commits into from
Nov 22, 2018

Conversation

Pomax
Copy link
Contributor

@Pomax Pomax commented Nov 21, 2018

Closes #2252, closes #2250, when copy changes have been made.

Note: the donate modal text is not tailored to the foundation site itself at all yet, so in terms of testing. Uncomment https://github.com/mozilla/foundation.mozilla.org/pull/2254/files#diff-bcb353d4a212e3c287b0d8d8c377f1c5R325 and then:

  • does the code look sane?
  • does the modal pop up on localhost:8000 after 10 seconds in the same way that it does for the PNI subsite?
  • does the CSS seem to be doing the right thing for the main site?

@Pomax Pomax requested a review from mmmavis November 21, 2018 21:13
@cadecairos cadecairos temporarily deployed to foundation-mofostaging-pr-2254 November 21, 2018 21:14 Inactive
@alanmoo alanmoo temporarily deployed to foundation-mofostaging-pr-2254 November 21, 2018 21:15 Inactive
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 21, 2018 21:24 Inactive
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 21, 2018 21:49 Inactive
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 21, 2018 22:46 Inactive
@Pomax Pomax changed the title make the modal mostly its own thing [WIP] make the modal mostly its own thing Nov 21, 2018
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 21, 2018 22:51 Inactive
@Pomax Pomax changed the title [WIP] make the modal mostly its own thing make the modal mostly its own thing Nov 21, 2018
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 21, 2018 22:54 Inactive
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 22, 2018 00:04 Inactive
@mmmavis mmmavis temporarily deployed to foundation-mofostaging-pr-2254 November 22, 2018 01:07 Inactive
source/js/buyers-guide/bg-main.js Outdated Show resolved Hide resolved
source/js/main.js Outdated Show resolved Hide resolved
source/sass/main.scss Show resolved Hide resolved
source/js/donate-modal/donate-modal.jsx Outdated Show resolved Hide resolved
source/js/donate-modal/dnt.js Outdated Show resolved Hide resolved
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 22, 2018 18:36 Inactive
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 22, 2018 18:38 Inactive
@Pomax
Copy link
Contributor Author

Pomax commented Nov 22, 2018

@mavis I folded the "moving the react-ga-proxy" into this PR mostly because it affects the modal directly.

@Pomax Pomax requested a review from mmmavis November 22, 2018 19:14
@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-2254 November 22, 2018 19:15 Inactive
@Pomax
Copy link
Contributor Author

Pomax commented Nov 22, 2018

I've also updated the main page modal to use the "for now" phrasing mentioned in #2250 (comment) /cc @kristinashu

image

@kristinashu
Copy link

Yeah let's run will this that copy for now!

Looks like the pink button is less round in this version than on Privacy Not Included? Can you make the ends fully rounded?

Copy link
Collaborator

@mmmavis mmmavis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neattt! ✨ Please merge this PR after fixing donate button's border radius!

@mmmavis
Copy link
Collaborator

mmmavis commented Nov 22, 2018

@kristinashu I fixed the button roundness plus adjusted button text from 14px to 16px as per mockup.

@kristinashu
Copy link

Looks good, thanks!

@mmmavis mmmavis merged commit 748f156 into master Nov 22, 2018
@mmmavis mmmavis deleted the modal-spinoff branch November 22, 2018 20:27
@mmmavis mmmavis restored the modal-spinoff branch November 22, 2018 20:27
@mmmavis mmmavis deleted the modal-spinoff branch January 2, 2019 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

refactor donate modal in preparation of spin-off Add donate banner to main Foundation site templates
5 participants