gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix "Theme defined" option not working in font overrride (#2197)

Browse Source
This commit is contained in:
Abitofevrything 2021-10-03 20:54:20 +02:00 committed by GitHub
parent a1ca538106
commit ec3b844026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/routes/api/fonts.js
View File

@ -11,21 +11,27 @@ function getFontCss(req, res) {
const optionsMap = optionService.getOptionsMap(); const optionsMap = optionService.getOptionsMap();
const mainFontFamilyOverridden = optionsMap.mainFontFamily != 'theme';
const treeFontFamilyOverridden = optionsMap.treeFontFamily != 'theme';
const detailFontFamilyOverridden = optionsMap.detailFontFamily != 'theme';
const monospaceFontFamilyOverridden = optionsMap.monospaceFontFamily != 'theme';
// using body to be more specific than themes' :root // using body to be more specific than themes' :root
res.send(` let style = 'body {';
body {
--main-font-family: ${optionsMap.mainFontFamily};
--main-font-size: ${optionsMap.mainFontSize}%;
--tree-font-family: ${optionsMap.treeFontFamily}; if (mainFontFamilyOverridden) style += `--main-font-family: ${optionsMap.mainFontFamily};`;
--tree-font-size: ${optionsMap.treeFontSize}%; if (treeFontFamilyOverridden) style += `--tree-font-family: ${optionsMap.treeFontFamily};`;
if (detailFontFamilyOverridden) style += `--detail-font-family: ${optionsMap.detailFontFamily};`;
if (monospaceFontFamilyOverridden) style += `--monospace-font-family: ${optionsMap.monospaceFontFamily};`;
--detail-font-family: ${optionsMap.detailFontFamily}; style += `--main-font-size: ${optionsMap.mainFontSize}%;`;
--detail-font-size: ${optionsMap.detailFontSize}%; style += `--tree-font-size: ${optionsMap.treeFontSize}%;`;
style += `--detail-font-size: ${optionsMap.detailFontSize}%;`;
style += `--monospace-font-size: ${optionsMap.monospaceFontSize};`;
--monospace-font-family: ${optionsMap.monospaceFontFamily}; style += '}';
--monospace-font-size: ${optionsMap.monospaceFontSize};
}`); res.send(style);
} }
module.exports = { module.exports = {