self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

Fixed theme handling for new tag feature

Browse Source
This commit is contained in:
Laurent Cozic 2018-11-07 22:47:34 +00:00
parent ee106105d8
commit 11ddc55911
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ElectronClient/app/theme.js
View File

@ -21,7 +21,6 @@ const globalStyle = {
toolbarHeight: 35,
tagItemPadding: 3,
tagBackgroundColor: '#e5e5e5',
};
// For WebView - must correspond to the properties above
@ -108,9 +107,8 @@ const lightStyle = {
selectedColor2: "#0269C2",
colorError2: "#ff6c6c",
raisedBackgroundColor: "#0080EF",
raisedColor: "#003363",
raisedHighlightedColor: "#ffffff",
raisedBackgroundColor: "#e5e5e5",
raisedColor: "#222222",
warningBackgroundColor: "#FFD08D",
@ -146,9 +144,8 @@ const darkStyle = {
selectedColor2: "#0269C2",
colorError2: "#ff6c6c",
raisedBackgroundColor: "#0F2051",
raisedColor: "#788BC3",
raisedHighlightedColor: "#ffffff",
raisedBackgroundColor: "#474747",
raisedColor: "#ffffff",
warningBackgroundColor: "#CC6600",
@ -166,18 +163,23 @@ const darkStyle = {
codeThemeCss: "atom-one-dark-reasonable.css",
};
globalStyle.tagStyle = {
fontSize: globalStyle.fontSize,
fontFamily: globalStyle.fontFamily,
marginTop: globalStyle.itemMarginTop * 0.4,
marginBottom: globalStyle.itemMarginBottom * 0.4,
marginRight: globalStyle.margin * 0.3,
paddingTop: globalStyle.tagItemPadding,
paddingBottom: globalStyle.tagItemPadding,
paddingRight: globalStyle.tagItemPadding * 2,
paddingLeft: globalStyle.tagItemPadding * 2,
backgroundColor: globalStyle.tagBackgroundColor
};
function addExtraStyles(style) {
style.tagStyle = {
fontSize: style.fontSize,
fontFamily: style.fontFamily,
marginTop: style.itemMarginTop * 0.4,
marginBottom: style.itemMarginBottom * 0.4,
marginRight: style.margin * 0.3,
paddingTop: style.tagItemPadding,
paddingBottom: style.tagItemPadding,
paddingRight: style.tagItemPadding * 2,
paddingLeft: style.tagItemPadding * 2,
backgroundColor: style.raisedBackgroundColor,
color: style.raisedColor,
};
return style;
}
let themeCache_ = {};
@ -193,6 +195,11 @@ function themeStyle(theme) {
output = Object.assign({}, globalStyle, darkStyle);
}
// TODO: All the theme specific things should go in addExtraStyles
// so that their definition is not split between here and the
// beginning of the file. At least new styles should go in
// addExtraStyles.
output.textStyle = Object.assign({},
output.textStyle,
{ color: output.color }
@ -270,6 +277,8 @@ function themeStyle(theme) {
}
);
output = addExtraStyles(output);
themeCache_[theme] = output;
return themeCache_[theme];
}