Also update Normalize.css for SASS

[mtomas7]

Related to: https://github.com/Automattic/_s/pull/1155/files#diff-da232d78aa810382f2dcdceae308ff8e

[grappler]

@mtomas7 Could you update the Sass in #1155 so that the changes are not scattered?

[mtomas7]

@grappler Hi, I'm just making baby steps with Git and currently using Desktop client on Win. Is it done (amending some older commit) something like:

https://stackoverflow.com/questions/8824971/how-to-amend-older-git-commit/18150592#18150592

Thank you!

[grappler]

@mtomas7 I hope to get a longer answer to you later in form of a long form text. Till then I have a few small tips.

• Keep your master clean. Don't make changes to the master branch. This explains how to keep your master branch up to date to the main/upstream master branch https://help.github.com/articles/syncing-a-fork/
• Create a new branch when making a new change. You have done this well in Update Normalize.css to v7.0.0 #1155 where you have a branch called patch-2. If you want to commit to that PR you need to checkout that branch. This would be the command git checkout patch-2
• Personally I would not amend a commit but just add a new commit and push it. As you can see in Update Normalize.css to v7.0.0 #1155 you have already 4 commits. Once the all of the changes have been done correctly I will ask you to squash all of the commits but we can have a look at that when the time comes.

You can ping me on wordpress.slack.com if you get stuck. I am happy to help.