RiverLea 1.3.8: 14 dark-mode fixes, 3 other fixes, 2 new variables & #31994 - #32209
Merged
Conversation
|
🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷 Introduction for new contributors...
Quick links for reviewers...
|
Member
|
@vingle there's a stylechecker fail |
Contributor
Author
|
Thanks! updated… |
vingle
commented
Feb 26, 2025
Comment on lines
-256
to
-258
| --crm-alert-background-warning: var(--crm-c-yellow-light); | ||
| --crm-alert-border-warning: var(--crm-c-yellow); | ||
| --crm-alert-text-warning: var(--crm-c-text); |
Contributor
Author
There was a problem hiding this comment.
@artfulrobot there's a bunch of changes to Thames in this PR, but all of them are Ufundo's #31994 and are structural with the exception of here - which is trying to fix this problem below (somewhat linked to light/dark text). However I just realise I made a mistake - will commit a fix…
Contributor
Contributor
|
Looks good to me too @vingle All the pain points I'm aware of look good to me and definitely good to have those variable names sorted. Thanks for all your testing and you too @artfulrobot |
This was referenced Mar 17, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.

Sorry for a large PR into the RC branch - but a chunk of this is @ufundo's PR, and of the other 17 changes - 14 impact dark mode. They're fixes to things that are illegible/non-functional - so the changes seem necessary. They were only found while doing a slow detailed test across all streams of #31994 - and that's why they're bundled together.
1. Riverlea - merge crm-c-light-text and crm-c-text-light
This includes the PR #31994. If that gets merged first then this needs rebasing. Related to that is the addition of two new CSS variables:
--crm-checkbox-list-bg:
--crm-checkbox-list-bg2:
2. Bootstrap Time input fields have a sensible width, not 100%
As seen in SearchKit Configure Settings tab. This is perhaps the one PR that's not involving broken
Before
After
3. PrettyPrint code blocks (e.g. on API3 & API4) should wrap when in limited space.
NB - this does fix the issue in all code blocks but many
Before
After
4. Contact Dashboard inline edit name - reset position and add drop-shadow to distinguish
This fixes a regression with the position of inline-edit on the contact dashboard, possibly linked to this. It impacts all Streams a little differently.
Before
After
5. All Dark modes - forces a light bg colour to 'prettyprint' code blocks as inverting the colours would require many replacements, also addresses some API3 code blocks.
Before
After
6. All Dark modes - FormBuilder input text illegible, changed colour to 'crm-c-text'
Before
After
7. ALL Dark modes - FomrBuilder GUI bar inline span colour illegible, changed colour to 'crm-c-text'
Before
After
8. All Dark - Select2 'disabled' list items illegible, set bg colour and changed cursor icon to 'not-allowed'.
Before
After (can't show cursor in screengrab)
9. All Dark - FormBuilder crm-ui-editable region hover illegible, changed text colour from inherit to 'crm-c-text-dark' - created RL version of ang/crmUI.css to achieve.
Before
After
10. ALL Dark - FormBuilder settings / gears icon was an illegible colour.
Before
After
11. All Dark - SearchKit 'where' 'and' labels illegible. Changed colour to 'crm-primary-text' to match 'crm-primary' background.
NB - for reasons not immediately clear, the #fff text is tinted, so not WCAG AAA - but that could be tackled in 6.1.
Before
After
12. All Dark - pie chart legend text made legible, setting text fill colour to 'crm-c-text'
Before
After
13. All Dark - '.alert-warning' paragraph text given explicit colour to resolve clash with '.alert' paragraph colour.
Before
After
14. Minetta & Hackney Dark illegible info alerts: 'crm-alert-text-info' changed to '-—crm-c-text-light' from '-—crm-c-blue-light'
Before
After
15. Minetta & Hackney Dark - illegible alert buttons: removed '--crm-c-alert-text' & '-—crm-c-alert' from dark.css
Before
After
16. Hackney & Thames Dark - warning alert text colour setting removed to make legible
This is likely a regression from 31994.
Before
After
17. Minetta Dark - primary/primary hover darkened with dark.css variables to stand out on tab region navbar.
Before
After
18. Walbrook Dark - Crm-c-success-text & crm-c-warning-text - change from dark to light as bg colours have changed.
This is likely a regression from 31994.
Before
After
Technical Details
This has been tested across all four streams, dark and light modes: on ThemeTest, FormBuilder & Search UIs, Contact Dashboard - all tabs & edit, Civi Dashboard, API3, API4.
Comments
Sidenote while doing this with a new contrast ratio tool I noticed that not every screen is 100% using WCAG AA or AAA contrast ratios, and there's also legibility issue with dark-mode code layout in the API4 Explorer Code Panel help box. However I felt both of these points could be tackled on master branch against 6.1/6.2, while these issues here impact functionality (in dark mode).