Skip to content

Update tooling #2

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Update tooling #2

wants to merge 17 commits into from

Conversation

FlynnD273
Copy link

Update to the latest Jekyll/Ruby version, and the latest SCSS syntax

Sorixelle
Sorixelle requested changes Jul 20, 2025
View reviewed changes
Copy link
Member

@Sorixelle Sorixelle left a comment

Choose a reason for hiding this comment

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

You'll probably want to rebase this branch, since I've duplicated some of the work here recently (sorry - missed this PR until now 😅).

The main thing here I didn't work on is converting Sass @imports to @use, since that one needs some thinking about how to handle cleanly. Feel free to take some stabs at that issue in this PR, if you'd like!

@Sorixelle Sorixelle mentioned this pull request Jul 20, 2025
Closed
@Sorixelle
Copy link
Member

There's still quite a few conflicts - can you resolve them?

@FlynnD273
Copy link
Author

???
Okay seems that I've messed up the merge. Diffs are messed up

@FlynnD273
Copy link
Author

Actually maybe I'm just confused lol. It looks like #5305664 is just adding a bunch of files from upstream/main?

@FlynnD273 FlynnD273 force-pushed the update-tooling branch 2 times, most recently from 6699468 to 5305664 Compare July 21, 2025 20:02
@FlynnD273
Copy link
Author

Okay. I think everything's working now finally maybe 😭
I still need to do a second pass, reverting the header comment formatting and alphabetising the @use directives but it at least runs now.

@FlynnD273 FlynnD273 requested a review from Sorixelle July 21, 2025 21:10
@FlynnD273
Copy link
Author

Sorry for the huge PR 😢

@Sorixelle
Copy link
Member

It looks like a bunch of CSS was duplicated into source/_sass/_site. Can you clean that up?

@FlynnD273
Copy link
Author

It looks like a bunch of CSS was duplicated into source/_sass/_site. Can you clean that up?

Yup. I'm not actually sure how those files came to be, I assumed they were born when I merged upstream. But looking at upstream, it seems not so I'm confused 😅

@Sorixelle Sorixelle force-pushed the main branch 2 times, most recently from 7a8e35d to 97c10ba Compare August 3, 2025 03:47
@Sorixelle Sorixelle added type: enhancement New feature or request area: static Changes to static assets eg. Sass styles, JavaScript labels Aug 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sorixelle Sorixelle Awaiting requested review from Sorixelle

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
area: static Changes to static assets eg. Sass styles, JavaScript type: enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FlynnD273 @Sorixelle