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

Edits for CSS chapter #2533

Merged
merged 17 commits into from
Nov 28, 2021
Merged

Edits for CSS chapter #2533

merged 17 commits into from
Nov 28, 2021

Conversation

shantsis
Copy link
Contributor

@shantsis shantsis commented Nov 17, 2021

Progress on #2525
Closes #2140

Stage link: https://20211117t072414-dot-webalmanac.uk.r.appspot.com/en/2021/css

Added some To Do's for the authors as well

Added some To Do's for the authors as well
@shantsis shantsis added the editing Content excellence label Nov 17, 2021
@rviscomi rviscomi added this to the 2021 Launch 🚀 milestone Nov 17, 2021
src/content/en/2021/css.md Outdated Show resolved Hide resolved
src/content/en/2021/css.md Outdated Show resolved Hide resolved
src/content/en/2021/css.md Outdated Show resolved Hide resolved
@tunetheweb
Copy link
Member

Did a few housekeeping tasks:

src/content/en/2021/css.md Outdated Show resolved Hide resolved
src/content/en/2021/css.md Outdated Show resolved Hide resolved
@tunetheweb
Copy link
Member

I've internationalised the links and replaced smart quotes with non-smart quotes in 6171bf4

@tunetheweb
Copy link
Member

Added colour swatches:

Colour swatches on table

@meyerweb
Copy link
Member

I want to accept nearly all of the above changes, but there are a few I want to tweak. Should I just make notes of where I want to tweak, accept all, and then make my own changes? I’m not used to this way of managing edits, so assume I don’t know how any of this works (if my question didn’t already make that clear).

@tunetheweb
Copy link
Member

If it's a small number of tweaks, then the review feature of GitHub works well.

If it's a larger number of small edits, then I think we've got to trust our authors (but also our editors!). So if @shantsis agrees then I'm happy for you to push straight to this branch for those further tweaks. We can always keep an eye on the commits to see the extra changes.

However, if you are straight out reverting an edit, then it's polite to add a comment using the Review feature of GitHub to highlight your reason for disagreeing with it and why you want to revert it, and then only committing once agreement is reached.

Similarly if you want to make mass changes (e.g. rewrite a whole section, or re-order the whole thing), or other "controversial" changes (and I realise that's a very subjective call!), then a discussion here first would be preferred. Or maybe a follow on PR.

That sound fair to all?

@meyerweb
Copy link
Member

I left comments where appropriate above. Not sure what else I can do at the moment.

@shantsis
Copy link
Contributor Author

I left comments where appropriate above. Not sure what else I can do at the moment.

Feel free to push it straight in @meyerweb

src/content/en/2021/css.md Outdated Show resolved Hide resolved
src/content/en/2021/css.md Outdated Show resolved Hide resolved
@tunetheweb
Copy link
Member

Doing some minor edits for some issues I've spotted. Then will merge this.

@tunetheweb
Copy link
Member

OK completed the final edits.

The main change (other than minor typos and additional code formatting) was to move the charts before the analysis. I appreciate not everyone will agree to this way of presenting the data, but that is the Web Almanac style (present data, then give interpretation) so believe consistency is important here.

I'm going to merge this now but happy to take further PRs if people spot anything!

@tunetheweb tunetheweb merged commit 4a29f76 into main Nov 28, 2021
@tunetheweb tunetheweb deleted the css-2021-edits branch November 28, 2021 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
editing Content excellence
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CSS 2021
4 participants