Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	yarn.lock
This commit is contained in:
Eugene Pankov
2018-08-21 14:43:05 +02:00
6 changed files with 1181 additions and 1148 deletions

View File

@@ -220,8 +220,6 @@ start = () => {
minWidth: 400,
minHeight: 300,
webPreferences: {webSecurity: false},
//- background to avoid the flash of unstyled window
backgroundColor: '#131d27',
frame: false,
show: false,
}
@@ -235,9 +233,8 @@ start = () => {
}
}
if (['darwin', 'win32'].includes(process.platform)) {
options.transparent = true
delete options.backgroundColor
if (process.platform == 'linux') {
options.backgroundColor = '#131d27'
}
app.commandLine.appendSwitch('disable-http-cache')