This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Add a function to get the "base" theme for a theme #3615
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
Useful for trying to load the right assets first. See element-hq/element-web#11381
jryans
approved these changes
Nov 14, 2019
| */ | ||
| export function getBaseTheme(theme) { | ||
| if (!theme) return "light"; | ||
| if (theme.startsWith("custom-")) { |
There was a problem hiding this comment.
setTheme in the same module shares a lot of this code... Any chance to de-duplicate?
There was a problem hiding this comment.
I'm not sure it's much better... thoughts?
diff --git a/src/theme.js b/src/theme.js
index 8a15c606d..b346a915b 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -85,10 +85,9 @@ export function setTheme(theme) {
if (!theme) {
theme = SettingsStore.getValue("theme");
}
- let stylesheetName = theme;
- if (theme.startsWith("custom-")) {
+ let stylesheetName = getBaseTheme(theme);
+ if (stylesheetName.endsWith("-custom")) {
const customTheme = getCustomTheme(theme.substr(7));
- stylesheetName = customTheme.is_dark ? "dark-custom" : "light-custom";
setCustomThemeVars(customTheme);
}There was a problem hiding this comment.
Hmm, alright, let's go with what you had then! Thanks for checking it out. 😄
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Useful for trying to load the right assets first.
Please review with element-hq/element-web#11381