Skip to content

Remove CSS from HTML section#12752

Merged
raisedadead merged 1 commit intofreeCodeCamp:stagingfrom
HKuz:fix/noCSSinHTML
Jan 27, 2017
Merged

Remove CSS from HTML section#12752
raisedadead merged 1 commit intofreeCodeCamp:stagingfrom
HKuz:fix/noCSSinHTML

Conversation

@HKuz
Copy link
Copy Markdown
Member

@HKuz HKuz commented Jan 22, 2017

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

  • Small bug fix (non-breaking change which fixes an issue)

Checklist:

Description

  • Removes all CSS in seed code and one reference to CSS that was in a challenge's text (adjusts the translations, too)
  • Adds an <hr> to delineate instructions part of challenge copy per this comment
  • Carries a main tag that's introduced with a new challenge through the seed code
  • Fixed one test in Turn an Image into a Link challenge to remove the class name reference
  • Makes a re-order edit as suggested in [beta] Basic HTML - challenge "Add Images to your Website" feels out of place #12659 and also moves the Introduction to HTML5 Elements challenge back a bit to flow more logically with the other challenges
  • for good measure, changes "Free Code Camp" to "freeCodeCamp" 😄

@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 22, 2017
@dhcodes
Copy link
Copy Markdown
Contributor

dhcodes commented Jan 24, 2017

@HKuz you may need to rebase your branch (git pull --rebase upstream staging) and then push this again with -f to get resolve the conflict.

@HKuz
Copy link
Copy Markdown
Member Author

HKuz commented Jan 24, 2017

Thanks @dhcodes - I'll fix these now. I thought this might happen if the 'change Instructions to hr' PR got merged first 😄

Copy link
Copy Markdown
Member

@raisedadead raisedadead left a comment

Choose a reason for hiding this comment

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

✨ ✨ LGTM. ✨ ✨

Thanks @HKuz

@raisedadead raisedadead merged commit 87d9f76 into freeCodeCamp:staging Jan 27, 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 27, 2017
@HKuz
Copy link
Copy Markdown
Member Author

HKuz commented Jan 27, 2017

Thanks for the QA @raisedadead! 👍 🎇

@HKuz HKuz deleted the fix/noCSSinHTML branch January 27, 2017 23:27
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.

4 participants