Skip to content

Dark Mode#58

Merged
mrysav merged 13 commits into
mainfrom
mrysav-dark-mode
Apr 29, 2026
Merged

Dark Mode#58
mrysav merged 13 commits into
mainfrom
mrysav-dark-mode

Conversation

@mrysav
Copy link
Copy Markdown
Contributor

@mrysav mrysav commented Apr 22, 2026

Rebases #28 from main and does not merge from staging or feat-supplier-dashboard

This was a fair bit of manual work to try and pick out the relevant commits from the other branch to isolate them into this branch, and I think I likely missed some. However, everyone's authorship on their respective commits should be preserved.

@mrysav mrysav changed the title [DRAFT] Clean up dark mode diff Dark Mode Apr 24, 2026
@mrysav mrysav marked this pull request as ready for review April 24, 2026 01:35
@mrysav mrysav requested a review from a team as a code owner April 24, 2026 01:35
@dipenp495
Copy link
Copy Markdown
Contributor

  • fix --primary CSS variable in dark mode (was near-white, now blue)
  • add dark mode to Pickup Request History table and restyle to match Product List
  • add dark mode to Claimant Contacts modal (was fully white in dark mode)
  • add dark mode to Claimed Products section in nonprofit My Claims tab
  • add dark mode to Copy Request Form modal
  • add dark mode to Deletion Confirmation popup cancel button
  • fix chart container backgrounds (bg-white → bg-card) in admin Overview
  • fix chart title text colors to use text-foreground across all chart components

@mrysav
Copy link
Copy Markdown
Contributor Author

mrysav commented Apr 28, 2026

@dipenp495: Why did you merge the old branch into this one? I specifically created this branch to not create a tangled merge with the old branch. Please stop.

I will go through and pick this apart later.

@dipenp495
Copy link
Copy Markdown
Contributor

@mrysav Sorry for the confusion here. I asked you earlier if I could commit a few fixes for dark mode, and you agreed, so I went ahead and pushed them. I understand the concern about keeping this branch clean though, so I can remove my commit from the branch.

Also, this branch is missing a few dark mode updates, which is what I was trying to address.

…dal, claimed products, copy/delete popups, admin charts
@mrysav mrysav force-pushed the mrysav-dark-mode branch from 7465885 to 3aa6a20 Compare April 28, 2026 23:28
@mrysav
Copy link
Copy Markdown
Contributor Author

mrysav commented Apr 28, 2026

@dipenp495 I see. I'm sorry for my comment earlier. I did a git reset and git commit of the merge commit to just capture what you had changed and I see what the changes are now.

I find it pretty hard to review React code the start with and I am trying to keep a fairly logical commit history here since the dark mode changes are fairly intrusive, and I've been going commit by commit to review the changes. Additionally, and importantly, I wanted to restrict this only to dark mode and not have other changes slip in, so I can review those independently.

I think we should be good to merge this.

Copy link
Copy Markdown
Contributor Author

@mrysav mrysav left a comment

Choose a reason for hiding this comment

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

Did a review, pulled the code, and I'm happy with the results. @iamsrijan724 @kierstinhicks @dipenp495 I'm going to merge this branch - any future work can be its own PR! Thanks!

@mrysav mrysav merged commit 4493b78 into main Apr 29, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants