self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Desktop: Moved buttons up on Config screen for consistency with other screens

Browse Source
This commit is contained in:
Laurent Cozic 2019-02-10 16:29:06 +00:00
parent 2203a39917
commit a03aa62d58
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ElectronClient/app/gui/ConfigScreen.jsx
View File

@ -56,12 +56,16 @@ class ConfigScreenComponent extends React.Component {
}
const sectionStyle = {
borderTopWidth: 1,
borderTopColor: theme.dividerColor,
borderTopStyle: 'solid',
marginBottom: 20,
};
const headerStyle = Object.assign({}, theme.headerStyle, {
borderBottomWidth: 1,
borderBottomColor: theme.dividerColor,
borderBottomStyle: 'solid',
paddingBottom: '.4em',
});
if (section.name === 'general') {
sectionStyle.borderTopWidth = 0;
}
@ -74,7 +78,7 @@ class ConfigScreenComponent extends React.Component {
return (
<div key={key} style={sectionStyle}>
<h2 style={theme.headerStyle}>{Setting.sectionNameToLabel(section.name)}</h2>
<h2 style={headerStyle}>{Setting.sectionNameToLabel(section.name)}</h2>
{noteComp}
<div>
{settingComps}
@ -338,21 +342,21 @@ class ConfigScreenComponent extends React.Component {
display: 'flex',
alignItems: 'center',
padding: 15,
borderTopWidth: 1,
borderTopStyle: 'solid',
borderTopColor: theme.dividerColor,
borderBottomWidth: 1,
borderBottomStyle: 'solid',
borderBottomColor: theme.dividerColor,
};
return (
<div style={style}>
<div style={buttonBarStyle}>
<button onClick={() => {this.onCancelClick()}} style={buttonStyle}>{'⬅ ' + _('Cancel')}</button>
<button disabled={!hasChanges} onClick={() => {this.onSaveClick()}} style={buttonStyleApprove}>{_('OK')}</button>
<button disabled={!hasChanges} onClick={() => {this.onApplyClick()}} style={buttonStyleApprove}>{_('Apply')}</button>
</div>
<div style={containerStyle}>
{ settingComps }
</div>
<div style={buttonBarStyle}>
<button disabled={!hasChanges} onClick={() => {this.onSaveClick()}} style={buttonStyleApprove}>{_('OK')}</button>
<button onClick={() => {this.onCancelClick()}} style={buttonStyle}>{_('Cancel')}</button>
<button disabled={!hasChanges} onClick={() => {this.onApplyClick()}} style={buttonStyleApprove}>{_('Apply')}</button>
</div>
</div>
);
}