From a1275ab9119e47373e1d9237e0941b7ae2adf71c Mon Sep 17 00:00:00 2001 From: Mikunj Date: Wed, 12 Dec 2018 14:55:46 +1100 Subject: [PATCH 1/2] Fix css on linux. --- stylesheets/_global.scss | 1 + stylesheets/_index.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss index d7f670714..51240b787 100644 --- a/stylesheets/_global.scss +++ b/stylesheets/_global.scss @@ -813,6 +813,7 @@ textarea { color: $color-dark-05; height: auto; padding: 0; + background: inherit; ::-webkit-scrollbar-track { background: $color-dark-85; diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index 24ee7b0e1..c7dc074e4 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -64,6 +64,7 @@ min-height: 0px; flex: 1 1 auto; color: $color-gray-05; + background: inherit; } .loki { From 35c8f32461c2fce608a7c8b0261da3ca682d33d0 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Wed, 12 Dec 2018 15:55:20 +1100 Subject: [PATCH 2/2] Fixed app quitting after unlock on linux. --- main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 5fc463a88..480194b2d 100644 --- a/main.js +++ b/main.js @@ -479,7 +479,11 @@ function showPasswordWindow() { } passwordWindow.readyForShutdown = true; - app.quit(); + + // Quit the app if we don't have a main window + if (!mainWindow) { + app.quit(); + } }); passwordWindow.on('closed', () => {