Merge pull request #734 from ipfs-shipyard/master

Merge master onto feat/add-electron-tests
ipfs · Dec 5, 2018 · bd0b04a · bd0b04a
2 parents a9f748a + f750096
commit bd0b04a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/hooks/webui/index.js b/src/hooks/webui/index.js
@@ -46,7 +46,7 @@ export default async function (ctx) {
     window.focus()
   })
 
-  ipcMain.on('app.quit', () => {
+  app.on('before-quit', () => {
     // Makes sure the app quits even though we prevent
     // the closing of this window.
     window.destroy()

diff --git a/src/menubar/index.js b/src/menubar/index.js
@@ -15,7 +15,7 @@ export default async function (ctx) {
         skipTaskbar: true,
         width: 280,
         height: 385,
-        backgroundColor: '#ffffff',
+        backgroundColor: '#0b3a53',
         webPreferences: {
           nodeIntegration: true
         }