Skip to content
This repository has been archived by the owner on Sep 25, 2019. It is now read-only.

Typo errors #39

Merged
merged 5 commits into from
Jun 29, 2018
Merged

Typo errors #39

merged 5 commits into from
Jun 29, 2018

Conversation

Nirajn2311
Copy link
Member

@Nirajn2311 Nirajn2311 commented Jun 23, 2018

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)
  • 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:

  • Tested changes locally.
  • Addressed currently open issue (replace XXXXX with an issue no in next line)

Closes freeCodeCamp/#17697,
freeCodecamp/#17699,
freeCodeCamp/#17654,
freeCodeCamp/#17685,
freeCodeCamp/#17725,
freeCodeCamp/#17721

Description

Fixed Typos.

@scissorsneedfoodtoo
Copy link
Contributor

scissorsneedfoodtoo commented Jun 23, 2018

@Nirajn2311, thank you for this PR to fix all of these typos. Just a couple of things I noticed:

First, could you remove your package-lock.json file? No need to add that.

Next, I'm just wondering why you remove the id from the audio tag in the challenges/01-responsive-web-design/applied-accessibility.json file? It seems like the problem with that challenge is not that the audio tag in the example has an id attribute, just that the test doesn't account for users including one. I believe it's the test for that challenge that needs to be updated, rather than the example itself. But that's outside the scope of this PR, so it might be better to submit a separate PR to update that test in the future.

@Nirajn2311
Copy link
Member Author

Nirajn2311 commented Jun 23, 2018

@scissorsneedfoodtoo I have removed package-lock.json and reverted the id attribute commit.
Will do remaining typos in next weekend, as I am not free this week due to school and extra classes.

@scissorsneedfoodtoo
Copy link
Contributor

@Nirajn2311, shoot, I'm sorry. I didn't explain myself well when I said remove package-lock.json. We don't want to actually delete it, but use git rm package-lock.json to remove it from your commit.

No worries, we can revert to an earlier state pretty easily. Here are some steps:

  • Make sure you're on the right branch with git fix/typos
  • Run git reflog and you'll see a list of git reference logs.
  • Find the version of the branch you want to revert back to, for example ab6b04b HEAD@{1}: incorrect spelling of conversion(was converstion). (NOTE: I don't know what the string of letters and numbers will look like, but it won't be ab6b04b, which is just used as an example.)
  • Run git reset --hard ab6b04b
  • Check things locally to make sure everything's alright. Your package-lock.json file should be back now.
  • Run git reset --soft HEAD^
  • Run git reset package-lock.json
  • Finally, run git push -f origin HEAD

Now package-lock.json should be back in your remote and the Travis build should pass.

I'm sorry again for all the trouble. Please take your time and do this all when you can. Just let us know if you run into any problems along the way and hopefully we can get your changes merged soon.

@Nirajn2311
Copy link
Member Author

@scissorsneedfoodtoo sorry about the json file(will fix it tomorrow). Travis failed as it requires a proper format of commit messages and “delete package-lock.json” is not proper.

@scissorsneedfoodtoo
Copy link
Contributor

@Nirajn2311, no need to apologize! Thank you for investigating.

Actually I'm the one who should apologize. I was trying to restore your package-lock.json file, and messed up your commit log in the end. You may be able to use the commands above to roll back my changes/commits and restore the file yourself, though. I'm waiting to hear back from @raisedadead for his git command wizardry before I further mess things up with your PR. Either way, I'm very sorry about that!

Hope we can get these checks to pass and get your changes merged soon.

@Nirajn2311
Copy link
Member Author

Nirajn2311 commented Jun 24, 2018

@scissorsneedfoodtoo I created a new branch and copied it here as the branch had become messy.
Sorry if it caused any trouble.

@raisedadead
Copy link
Member

git checkout dev
git fetch upstream
git checkout dev -- package-lock.json

Incorrect spelling of penguin(was pengiun)
Incorrect spelling of conversion(was converstion)
Incorrect spelling of declare(was declar)
Incorrect spelling of equality(was equalty)
@Nirajn2311
Copy link
Member Author

@raisedadead @scissorsneedfoodtoo @Bouncey All typos and grammatical errors have been fixed. The PR can now be merged.

@scissorsneedfoodtoo scissorsneedfoodtoo merged commit 8c95c11 into freeCodeCamp:dev Jun 29, 2018
@scissorsneedfoodtoo
Copy link
Contributor

👍 👍 Awesome! Everything LGTM 👍 👍

Thank you for your PR to fix all of these typos, @Nirajn2311. We're all looking forward to your next contribution!

raisedadead pushed a commit that referenced this pull request Jun 29, 2018
@Nirajn2311 Nirajn2311 deleted the fix/typos branch June 29, 2018 17:25
raisedadead pushed a commit that referenced this pull request Jun 29, 2018
raisedadead pushed a commit that referenced this pull request Jun 29, 2018
raisedadead pushed a commit that referenced this pull request Jun 29, 2018
# [3.0.0](v2.0.0...v3.0.0) (2018-06-29)

### Bug Fixes

* **challenge:** Fixed the typo for automatically ([#48](#48)) ([dd046d6](dd046d6))
* **challenge:** Updated tests to avoid confusion ([#57](#57)) ([7105507](7105507))
* **challenges:** change test for template literals challenge ([#37](#37)) ([4b1c5eb](4b1c5eb))
* **challenges:** cherry pick pr 17664 & 17672 from main repo ([#52](#52)) ([2375d0c](2375d0c))
* **challenges:** fixed telephone number validator project ([#53](#53)) ([2b034e2](2b034e2)), closes [#47](#47)
* **challenges:** fixed typo in css-grid.json ([#46](#46)) ([e74192e](e74192e))
* **challenges:** grammar fix in css-grid auto-fit challenge ([#60](#60)) ([a6a0266](a6a0266))
* **challenges:** Typo errors ([#39](#39)) ([0c0702d](0c0702d))
* **challenges:** update regular expression that fails ([#56](#56)) ([9fa5907](9fa5907)), closes [#55](#55)

### BREAKING CHANGES

* **challenges:** None
raisedadead pushed a commit that referenced this pull request Jun 29, 2018
# [3.0.0](v2.0.0...v3.0.0) (2018-06-29)

### Bug Fixes

* **challenge:** Fixed the typo for automatically ([#48](#48)) ([dd046d6](dd046d6))
* **challenge:** Updated tests to avoid confusion ([#57](#57)) ([7105507](7105507))
* **challenges:** change test for template literals challenge ([#37](#37)) ([4b1c5eb](4b1c5eb))
* **challenges:** cherry pick pr 17664 & 17672 from main repo ([#52](#52)) ([2375d0c](2375d0c))
* **challenges:** fixed telephone number validator project ([#53](#53)) ([2b034e2](2b034e2)), closes [#47](#47)
* **challenges:** fixed typo in css-grid.json ([#46](#46)) ([e74192e](e74192e))
* **challenges:** grammar fix in css-grid auto-fit challenge ([#60](#60)) ([a6a0266](a6a0266))
* **challenges:** Typo errors ([#39](#39)) ([0c0702d](0c0702d))
* **challenges:** update regular expression that fails ([#56](#56)) ([9fa5907](9fa5907)), closes [#55](#55)

### BREAKING CHANGES

* **challenges:** None
anku255 pushed a commit to anku255/curriculum that referenced this pull request Jun 30, 2018
anku255 pushed a commit to anku255/curriculum that referenced this pull request Jun 30, 2018
# [3.0.0](freeCodeCamp/curriculum@v2.0.0...v3.0.0) (2018-06-29)

### Bug Fixes

* **challenge:** Fixed the typo for automatically ([freeCodeCamp#48](freeCodeCamp#48)) ([dd046d6](freeCodeCamp@dd046d6))
* **challenge:** Updated tests to avoid confusion ([freeCodeCamp#57](freeCodeCamp#57)) ([7105507](freeCodeCamp@7105507))
* **challenges:** change test for template literals challenge ([freeCodeCamp#37](freeCodeCamp#37)) ([4b1c5eb](freeCodeCamp@4b1c5eb))
* **challenges:** cherry pick pr 17664 & 17672 from main repo ([freeCodeCamp#52](freeCodeCamp#52)) ([2375d0c](freeCodeCamp@2375d0c))
* **challenges:** fixed telephone number validator project ([freeCodeCamp#53](freeCodeCamp#53)) ([2b034e2](freeCodeCamp@2b034e2)), closes [freeCodeCamp#47](freeCodeCamp#47)
* **challenges:** fixed typo in css-grid.json ([freeCodeCamp#46](freeCodeCamp#46)) ([e74192e](freeCodeCamp@e74192e))
* **challenges:** grammar fix in css-grid auto-fit challenge ([freeCodeCamp#60](freeCodeCamp#60)) ([a6a0266](freeCodeCamp@a6a0266))
* **challenges:** Typo errors ([freeCodeCamp#39](freeCodeCamp#39)) ([0c0702d](freeCodeCamp@0c0702d))
* **challenges:** update regular expression that fails ([freeCodeCamp#56](freeCodeCamp#56)) ([9fa5907](freeCodeCamp@9fa5907)), closes [freeCodeCamp#55](freeCodeCamp#55)

### BREAKING CHANGES

* **challenges:** None
@mpmaan
Copy link
Contributor

mpmaan commented Jul 9, 2018

@scissorsneedfoodtoo I believe that spelling error (pengiun instead of penguin) was intentional.

Add a fallback value of black to the background property of penguin-top and penguin-bottom classes. This style will be applied because of a typo in the variable name.
Now, the test gets passed but the color doesn't get changed to black.

freeCodeCamp/#17840

@scissorsneedfoodtoo
Copy link
Contributor

@mpmaan, doh! You're absolutely right. I didn't read that challenge description carefully enough.

Would you be interested in changing the spelling back to "pengiun", and maybe also making it a bit more clear in the description that the misspelling is intentional? Even making "Note" bold would be a huge improvement.

@mpmaan
Copy link
Contributor

mpmaan commented Jul 9, 2018

@scissorsneedfoodtoo okay, i'll try to fix it

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mispelling in CSS coding section
4 participants