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

Desktop: Fixed date popup dialog overflow issue inside info dialog

Browse Source
This commit is contained in:
Laurent Cozic 2020-05-25 17:37:37 +01:00
parent 0f7deeeac1
commit c97c337c79
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ElectronClient/theme.js
View File

@ -128,7 +128,7 @@ function addExtraStyles(style) {
};
style.textStyle2 = Object.assign({}, style.textStyle,
{ color: style.color2 }
{ color: style.color2 },
);
style.textStyleMinor = Object.assign({}, style.textStyle,
@ -142,7 +142,7 @@ function addExtraStyles(style) {
{
textDecoration: 'underline',
color: style.urlColor,
}
},
);
style.h1Style = Object.assign({},
@ -151,7 +151,7 @@ function addExtraStyles(style) {
color: style.color,
fontSize: style.textStyle.fontSize * 1.5,
fontWeight: 'bold',
}
},
);
style.h2Style = Object.assign({},
@ -160,7 +160,7 @@ function addExtraStyles(style) {
color: style.color,
fontSize: style.textStyle.fontSize * 1.3,
fontWeight: 'bold',
}
},
);
style.dialogModalLayer = {
@ -203,7 +203,6 @@ function addExtraStyles(style) {
maxHeight: '80%',
display: 'flex',
flexDirection: 'column',
overflow: 'auto',
};
style.buttonIconStyle = {
@ -275,7 +274,7 @@ function themeStyle(theme) {
output.icon = Object.assign({},
output.icon,
{ color: output.color }
{ color: output.color },
);
output.lineInput = Object.assign({},
@ -283,7 +282,7 @@ function themeStyle(theme) {
{
color: output.color,
backgroundColor: output.backgroundColor,
}
},
);
output.headerStyle = Object.assign({},
@ -291,7 +290,7 @@ function themeStyle(theme) {
{
color: output.color,
backgroundColor: output.backgroundColor,
}
},
);
output.inputStyle = Object.assign({},
@ -300,7 +299,7 @@ function themeStyle(theme) {
color: output.color,
backgroundColor: output.backgroundColor,
borderColor: output.dividerColor,
}
},
);
output.containerStyle = Object.assign({},
@ -308,7 +307,7 @@ function themeStyle(theme) {
{
color: output.color,
backgroundColor: output.backgroundColor,
}
},
);
output.buttonStyle = Object.assign({},
@ -318,7 +317,7 @@ function themeStyle(theme) {
backgroundColor: output.backgroundColor,
borderColor: output.dividerColor,
userSelect: 'none',
}
},
);
output = addExtraStyles(output);