From 1d8f729c9523a5748f9177a7607121646a83d5f7 Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Wed, 26 Oct 2016 19:37:44 -0500 Subject: [PATCH 1/4] Update accelerators to use var instead of function --- lib/main-menu.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index 56b7a0b4..18838cad 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -125,20 +125,14 @@ var view = { submenu: [ { label: 'Reload', - accelerator: (function () { - if (process.platform === 'darwin') return 'Command+R' - else return 'Ctrl+R' - })(), + accelerator: OSX ? 'Command+R' : 'Ctrl+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() } From cd5bc4e93089004527b464f156d87e64d3530db6 Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Wed, 26 Oct 2016 19:51:35 -0500 Subject: [PATCH 2/4] Simplify OSX accelerators (see here: http://electron.atom.io/docs/api/accelerator/#platform-notice) --- lib/main-menu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index 18838cad..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,7 +125,7 @@ var view = { submenu: [ { label: 'Reload', - accelerator: OSX ? 'Command+R' : 'Ctrl+R', + accelerator: 'CmdOrCtrl+R', click: function () { BrowserWindow.getFocusedWindow().reload() } From 68f0a25873546847376c375f212fce4969ce7182 Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Wed, 26 Oct 2016 20:39:54 -0500 Subject: [PATCH 3/4] Adds dark theme to controls in config window. --- browser/main/modals/PreferencesModal/ConfigTab.styl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl index eb475d78..1dd9a8ae 100644 --- a/browser/main/modals/PreferencesModal/ConfigTab.styl +++ b/browser/main/modals/PreferencesModal/ConfigTab.styl @@ -111,3 +111,8 @@ body[data-theme="dark"] border-color $ui-dark-borderColor background-color $ui-dark-backgroundColor color $ui-dark-text-color + .group-section-control + select, .group-section-control-input + border-color $ui-dark-borderColor + background-color $ui-dark-backgroundColor + color $ui-dark-text-color From 30324f6113157036a806217071b0d43520d615dd Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Wed, 26 Oct 2016 23:43:01 -0500 Subject: [PATCH 4/4] Refactors color changes into mixin --- browser/main/modals/PreferencesModal/ConfigTab.styl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl index 1dd9a8ae..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,11 +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 - border-color $ui-dark-borderColor - background-color $ui-dark-backgroundColor - color $ui-dark-text-color + colorDarkControl()