Skip to content

Conversation

ronjalh
Copy link
Member

@ronjalh ronjalh commented Oct 16, 2026

Summary

Brings the colours into dev. They were merged directly into main by accident (PR #35, "set up css variables", whose base was main), so dev does not have them.

This is a merge of main into dev. It contains only what main has and dev does not:

  • src/styles/variables.css: the colour palette, text colours, fonts, box settings, spacing and dark mode colours
  • src/styles/global.css (empty for now)
  • src/main.tsx: imports the two style files

These are 5 commits by @xenia_grib from PR #35. There are no conflicts, and nothing else from main is missing in dev.

Why

Merge it as a merge commit

Use "Create a merge commit", not squash or rebase, so that the history of main and dev stays shared.

Known problems in variables.css (not changed here)

This PR does not change the file, but two things in it do not work as intended:

  • --background-color is declared twice. The second value (#BDE981, the D-value green) wins and becomes the page background.
  • The [data-theme="dark"] block is nested inside :root { … }, so it matches a descendant of the root and not the page itself. Dark mode does not apply as written.

They should be fixed in a separate PR by whoever owns the design.

Testing

npm run lint, npm run build and npm test pass on the merged result.

🤖 Generated with Claude Code

@ronjalh ronjalh requested a review from a team as a code owner October 16, 2026 09:18
@ronjalh ronjalh self-assigned this Oct 16, 2026
Copy link
Member

@anettkva anettkva left a comment

Choose a reason for hiding this comment

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

good catch:)

@anettkva anettkva merged commit 92d0c21 into dev Oct 16, 2026
@anettkva anettkva deleted the merge-main-into-dev branch October 16, 2026 09:28
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants