Skip to content

Commit 43642ec

Browse files
committed
update to electron 0.36.3
1 parent 3314f71 commit 43642ec

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

app/assets/style/app.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,6 @@ body {
7878

7979

8080
@import "../../../node_modules/react-codemirror/node_modules/codemirror/lib/codemirror.css";
81-
@import "_cm-theme.scss"
81+
@import "_cm-theme.scss";
82+
83+
.CodeMirror-scroll { overflow-x:hidden !important;}

main.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ app.on('ready', function() {
4343
width: windowState.bounds && windowState.bounds.width || 550,
4444
height: windowState.bounds && windowState.bounds.height || 450,
4545
'dark-theme': true,
46+
backgroundColor: "#002b36",
4647
'web-preferences': {
47-
'overlay-scrollbars': true,
48+
'overlayScrollbars': true,
4849
}
4950
};
5051

package.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var devDeps = Object.keys(require('./package.json').devDependencies);
1111

1212

1313
var appName = argv.name || argv.n || 'FromScratch';
14-
var shouldUseAsar = argv.asar || argv.a || false;
14+
var shouldUseAsar = argv.asar || argv.a || true;
1515
var shouldBuildAll = argv.all || false;
1616

1717

@@ -41,7 +41,7 @@ if (version) {
4141
// use the same version as the currently-installed electron-prebuilt
4242
exec('npm list | grep electron-prebuilt', function(err, stdout, stderr) {
4343
if (err) {
44-
DEFAULT_OPTS.version = '0.34.0';
44+
DEFAULT_OPTS.version = '0.36.0';
4545
} else {
4646
DEFAULT_OPTS.version = stdout.split('@')[1].replace(/\s/g, '');
4747
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"css-loader": "^0.23.0",
5050
"del": "^2.0.1",
5151
"electron-packager": "^5.1.1",
52-
"electron-prebuilt": "^0.36.0",
52+
"electron-prebuilt": "^0.36.3",
5353
"electron-rebuild": "^1.0.0",
5454
"eslint": "^1.3.1",
5555
"eslint-config-airbnb": "^1.0.2",

0 commit comments

Comments
 (0)