mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-08-12 03:32:30 +08:00
client: add the "System" theme
This commit is contained in:
parent
1c3643695c
commit
aba2813682
@ -71,6 +71,7 @@ export default class ThemeOptions extends OptionsWidget {
|
|||||||
{ val: 'next', title: t("theme.triliumnext") },
|
{ val: 'next', title: t("theme.triliumnext") },
|
||||||
{ val: 'next-light', title: t("theme.triliumnext-light") },
|
{ val: 'next-light', title: t("theme.triliumnext-light") },
|
||||||
{ val: 'next-dark', title: t("theme.triliumnext-dark") },
|
{ val: 'next-dark', title: t("theme.triliumnext-dark") },
|
||||||
|
{ val: 'system', title: t('theme.system_theme') },
|
||||||
{ val: 'light', title: t('theme.light_theme') },
|
{ val: 'light', title: t('theme.light_theme') },
|
||||||
{ val: 'dark', title: t('theme.dark_theme') }
|
{ val: 'dark', title: t('theme.dark_theme') }
|
||||||
].concat(await server.get('options/user-themes'));
|
].concat(await server.get('options/user-themes'));
|
||||||
|
7
src/public/stylesheets/theme.css
Normal file
7
src/public/stylesheets/theme.css
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
/* Import the light color scheme.
|
||||||
|
* This is the base color scheme, always active and overridden by the dark
|
||||||
|
* color scheme stylesheet when necessary. */
|
||||||
|
@import url(./theme-light.css);
|
||||||
|
|
||||||
|
/* Import the dark color scheme when the system preference is set to dark mode */
|
||||||
|
@import url(./theme-dark.css) (prefers-color-scheme: dark);
|
@ -1072,6 +1072,7 @@
|
|||||||
"title": "Application Theme",
|
"title": "Application Theme",
|
||||||
"theme_label": "Theme",
|
"theme_label": "Theme",
|
||||||
"override_theme_fonts_label": "Override theme fonts",
|
"override_theme_fonts_label": "Override theme fonts",
|
||||||
|
"system_theme": "System",
|
||||||
"light_theme": "Light",
|
"light_theme": "Light",
|
||||||
"dark_theme": "Dark",
|
"dark_theme": "Dark",
|
||||||
"triliumnext": "TriliumNext Beta (Follow system color scheme)",
|
"triliumnext": "TriliumNext Beta (Follow system color scheme)",
|
||||||
|
@ -61,7 +61,9 @@ function index(req: Request, res: Response) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getThemeCssUrl(theme: string, themeNote: BNote | null) {
|
function getThemeCssUrl(theme: string, themeNote: BNote | null) {
|
||||||
if (theme === 'light') {
|
if (theme === 'system') {
|
||||||
|
return `${assetPath}/stylesheets/theme.css`;
|
||||||
|
} else if (theme === 'light') {
|
||||||
// light theme is always loaded as baseline
|
// light theme is always loaded as baseline
|
||||||
return false;
|
return false;
|
||||||
} else if (theme === 'dark') {
|
} else if (theme === 'dark') {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user