Skip to content

update links and formatting, project landing pages#12821

Merged
raisedadead merged 1 commit intofreeCodeCamp:stagingfrom
no-stack-dub-sack:fix/project-landing-pages
Jan 29, 2017
Merged

update links and formatting, project landing pages#12821
raisedadead merged 1 commit intofreeCodeCamp:stagingfrom
no-stack-dub-sack:fix/project-landing-pages

Conversation

@no-stack-dub-sack
Copy link
Copy Markdown
Member

@no-stack-dub-sack no-stack-dub-sack commented Jan 25, 2017 •
edited
Loading

Pre-Submission Checklist

  • Your pull request targets the staging branch of freeCodeCamp.
  • Branch starts with either fix/, feature/, or translate/ (e.g. fix/signin-issue)
  • You have only one commit (if not, squash them into one commit).
  • All new and existing tests pass the command npm test. Use git commit --amend to amend any fixes.

Type of Change

  • curriculum update
  • Small bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds new functionality)
  • Breaking change (fix or feature that would change existing functionality)
  • Add new translation (feature adding new translations)

Checklist:

Description

@QuincyLarson this PR addresses #12661:

  • updates all project landing pages with correct test suite CDN link
  • updates all project landing pages with correct test suite code pen links
  • added Tree Map D3 project
  • added dataset links for all D3 projects

There's still a bit to be done with the landing pages, so we will need to open a separate issue for that and/or condense already existing issues

@BerkeleyTrue BerkeleyTrue added the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Jan 25, 2017
raisedadead
raisedadead requested changes Jan 25, 2017
View reviewed changes
seed/challenges/03-front-end-libraries/front-end-libraries-projects.json Outdated

This comment was marked as off-topic.

Sign in to view

seed/challenges/04-data-visualization/data-visualization-projects.json Outdated

This comment was marked as off-topic.

Sign in to view

@raisedadead
Copy link
Copy Markdown
Member

raisedadead commented Jan 25, 2017

Do we really need bullet points, I am not a huge fan but this could just simply follow the same format as that of the previous JS and HTML challenges?

We already have less real estate, with the large font size. What do you think?

@no-stack-dub-sack
Copy link
Copy Markdown
Member Author

no-stack-dub-sack commented Jan 25, 2017

@raisedadead I'm ok with going no bullet points, I only did it there for consistency with the D3 projects that have multiple datasets which I felt needed them:
image

But I guess I could just leave them there where they make sense, and get rid of them everywhere else. Sound good? Or do you think I should just ditch them there too? I thought, for that one and the other with multiple, that it was important to let the user know what the particular dataset was for

@raisedadead
Copy link
Copy Markdown
Member

raisedadead commented Jan 26, 2017

Yeah, I think the label on top of the resources is important. And I also agree that you should leave the bullet points where they make sense as in the example above.

@no-stack-dub-sack
Copy link
Copy Markdown
Member Author

no-stack-dub-sack commented Jan 26, 2017

@raisedadead ok, so I'll change it to be in only those challenges that have multiple datasets, and leave the rest without bullet points. I still think it looks a little funny, be was have bigger things to worry about for the time being so this will do for now.

@raisedadead
Copy link
Copy Markdown
Member

raisedadead commented Jan 26, 2017

I think this needs a styling overhaul. but yeah if you could address the first comment about breaking the instructions to at least multiline, we can ignore the other aesthetics for now.

@BerkeleyTrue BerkeleyTrue changed the title (beta) update links and formatting, project landing pages update links and formatting, project landing pages Jan 26, 2017
@no-stack-dub-sack
Copy link
Copy Markdown
Member Author

no-stack-dub-sack commented Jan 27, 2017 •
edited
Loading

@raisedadead about to update the PR and I think this does it for now - added the multiline for the example like you said, and removed the bullets where they were not needed (from every challenge except D3 tree map and D3 choropleth where multiple datasets are needed)

Also, I definitely agree with you that these sections need an overall style overhaul 😄

@no-stack-dub-sack no-stack-dub-sack force-pushed the fix/project-landing-pages branch from 744aa8b to d5cfe1e Compare January 27, 2017 04:43
@no-stack-dub-sack
Copy link
Copy Markdown
Member Author

no-stack-dub-sack commented Jan 27, 2017

@raisedadead WAIT! Don't merge this yet - looks like #12720 affects this entire section, so once that PR is merged, I will rebase off of that before this gets merged. Does that make sense or should the merge still go ok if this is merged first?

@raisedadead raisedadead added the status: blocked In a transient & temporary hold. label Jan 27, 2017
@raisedadead
Copy link
Copy Markdown
Member

raisedadead commented Jan 27, 2017

Blocked for merge.

@raisedadead raisedadead force-pushed the fix/project-landing-pages branch from d5cfe1e to 8ddfefb Compare January 28, 2017 07:42
@raisedadead raisedadead removed the status: blocked In a transient & temporary hold. label Jan 28, 2017
@raisedadead
Copy link
Copy Markdown
Member

raisedadead commented Jan 28, 2017 •
edited
Loading

@no-stack-dub-sack I have resolved a merge conflict with this PR that came in with another PR #12909

Can you please do a sanity check and let me know, for a merge?

Also we need not wait for #12720, it already has conflicts and should be resolved separately.

@no-stack-dub-sack
Copy link
Copy Markdown
Member Author

no-stack-dub-sack commented Jan 28, 2017

@raisedadead Yup, if all you changed is adding the closing </a> tags to resolve that conflict than LGTM!

@raisedadead raisedadead merged commit 90ca422 into freeCodeCamp:staging Jan 29, 2017
@raisedadead raisedadead removed the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Jan 29, 2017
@no-stack-dub-sack no-stack-dub-sack deleted the fix/project-landing-pages branch January 29, 2017 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@raisedadead raisedadead raisedadead approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@no-stack-dub-sack @raisedadead @BerkeleyTrue