fix: dark mode logo now shows when specified #6077
Merged
Conversation
This file contains 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
nikk15
requested review from
keianhzo,
johnshaughnessy,
stalgiag,
nickgrato and
robinkwilson
nickgrato
reviewed
May 15, 2023
| @@ -80,7 +80,7 @@ module.exports = (env, argv) => { | |||
| RETICULUM_SERVER: "hubs.local:4000", | |||
| POSTGREST_SERVER: "", | |||
| ITA_SERVER: "turkey", | |||
| TIER: "p0" | |||
| TIER: "p1" | |||
There was a problem hiding this comment.
this is my own curiosity why do we need this one?
There was a problem hiding this comment.
Especially with the incoming work around theme customization, we use the admin panel theme tab a lot more now. It made sense to me to update this rather than manually do it each time.
nickgrato
reviewed
May 15, 2023
src/react-components/styles/theme.js
Outdated
| @@ -57,7 +57,7 @@ export function useTheme(themeId) { | |||
|
|
|||
| function getAppLogo(darkMode) { | |||
| const theme = getCurrentTheme(); | |||
| const shouldUseDarkLogo = theme ? theme.darkModeDefault : darkMode; | |||
| const shouldUseDarkLogo = theme ? (theme.darkModeDefault || theme.id.includes("dark-mode")) : darkMode; | |||
There was a problem hiding this comment.
yea I agree with your comment - would be good to have one source of truth for if it is dark mode or not.
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.
NOTE: I'm not sure I agree with the darkModeDefault property - when we tidy up custom theming, I'll look into alternatives.