diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl index eb475d78..62767f1a 100644 --- a/browser/main/modals/PreferencesModal/ConfigTab.styl +++ b/browser/main/modals/PreferencesModal/ConfigTab.styl @@ -86,6 +86,10 @@ p line-height 1.2 +colorDarkControl() + border-color $ui-dark-borderColor + background-color $ui-dark-backgroundColor + color $ui-dark-text-color body[data-theme="dark"] .root color $ui-dark-text-color @@ -108,6 +112,7 @@ body[data-theme="dark"] .group-control-rightButton colorDarkPrimaryButton() .group-hint - border-color $ui-dark-borderColor - background-color $ui-dark-backgroundColor - color $ui-dark-text-color + colorDarkControl() + .group-section-control + select, .group-section-control-input + colorDarkControl() diff --git a/lib/main-menu.js b/lib/main-menu.js index 56b7a0b4..c93b1de9 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -54,7 +54,7 @@ var file = { submenu: [ { label: 'New Note', - accelerator: OSX ? 'Command + N' : 'Control + N', + accelerator: 'CmdOrCtrl + N', click: function () { mainWindow.webContents.send('top:new-note') } @@ -125,20 +125,14 @@ var view = { submenu: [ { label: 'Reload', - accelerator: (function () { - if (process.platform === 'darwin') return 'Command+R' - else return 'Ctrl+R' - })(), + accelerator: 'CmdOrCtrl+R', click: function () { BrowserWindow.getFocusedWindow().reload() } }, { label: 'Toggle Developer Tools', - accelerator: (function () { - if (process.platform === 'darwin') return 'Command+Alt+I' - else return 'Ctrl+Shift+I' - })(), + accelerator: OSX ? 'Command+Alt+I' : 'Ctrl+Shift+I', click: function () { BrowserWindow.getFocusedWindow().toggleDevTools() }