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

2021 CSS chapter #2506

Merged
merged 13 commits into from
Nov 16, 2021
Merged

2021 CSS chapter #2506

merged 13 commits into from
Nov 16, 2021

Conversation

meyerweb
Copy link
Member

@meyerweb meyerweb commented Nov 15, 2021

Progress on #2140

Also corrected some errors in figure construction around image weight and counts. I hope I didn’t introduce more errors!

Staged URL: https://20211115t173622-dot-webalmanac.uk.r.appspot.com/en/2021/css

Also corrected some errors in figure construction around image weight and counts.  I hope I didn’t introduce more errors!
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
@rviscomi rviscomi added the writing Related to wording and content label Nov 15, 2021
@rviscomi rviscomi added this to the 2021 Content Writing milestone Nov 15, 2021
@rviscomi rviscomi changed the title Filled in the text around the figures 2021 CSS chapter Nov 15, 2021
src/content/en/2021/css.md Outdated Show resolved Hide resolved
meyerweb and others added 5 commits November 15, 2021 16:30
Second half still to come (need to go through and find my favorite bits).
rviscomi and others added 5 commits November 15, 2021 17:25
I hope the quote isn’t too spicy!
I decided to skip spicy for summarizing.
Lines 657-663 and 940-946
@meyerweb
Copy link
Member Author

This PR says there’s a change request to be dealt with, but I don’t see where to resolve it. Point me in the right direction and I’ll clear whatever blocker I can!

@tunetheweb
Copy link
Member

Let’s get #2480 updated and merged first and then can do one final merge conflict resolution here while we work through the chapter (which will take longer than just adding the contributors - hence why that’s in a separate PR in #2480)

@rviscomi
Copy link
Member

Ah I had just fixed the merge conflict. I'm ok to close #2480 and merge this PR to proceed to the editing stage.

@tunetheweb
Copy link
Member

Ah I had just fixed the merge conflict. I'm ok to close #2480 and merge this PR to proceed to the editing stage.

Wow didn't realise it was that close! Awesome!!!

@rviscomi rviscomi merged commit 01db6a2 into main Nov 16, 2021
@rviscomi rviscomi deleted the meyerweb-patch-text branch November 16, 2021 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
writing Related to wording and content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants