chore: merge main into dev (the colours from PR #35) #56
+63
−0
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Brings the colours into
dev. They were merged directly intomainby accident (PR #35, "set up css variables", whose base wasmain), sodevdoes not have them.This is a merge of
mainintodev. It contains only whatmainhas anddevdoes not:src/styles/variables.css: the colour palette, text colours, fonts, box settings, spacing and dark mode colourssrc/styles/global.css(empty for now)src/main.tsx: imports the two style filesThese are 5 commits by @xenia_grib from PR #35. There are no conflicts, and nothing else from
mainis missing indev.Why
dev, so they need the colour variables there.src/index.css(in the shadcn/ui and Tailwind PR feat: set up Tailwind CSS, shadcn/ui and Lucide icons #53) refer tosrc/styles/variables.css, whichdevdoes not have yet.mainanddevfrom drifting apart, so the later merge ofdevintomainis clean.Merge it as a merge commit
Use "Create a merge commit", not squash or rebase, so that the history of
mainanddevstays 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-coloris declared twice. The second value (#BDE981, the D-value green) wins and becomes the page background.[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 buildandnpm testpass on the merged result.🤖 Generated with Claude Code