update to electron 0.36.3

Kilian · Jan 9, 2016 · 43642ec · 43642ec
1 parent 3314f71
commit 43642ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/app/assets/style/app.scss b/app/assets/style/app.scss
@@ -78,4 +78,6 @@ body {
 
 
 @import "../../../node_modules/react-codemirror/node_modules/codemirror/lib/codemirror.css";
-@import "_cm-theme.scss"
+@import "_cm-theme.scss";
+
+.CodeMirror-scroll { overflow-x:hidden !important;}
diff --git a/main.js b/main.js
@@ -43,8 +43,9 @@ app.on('ready', function() {
  width: windowState.bounds && windowState.bounds.width || 550,
  height: windowState.bounds && windowState.bounds.height || 450,
  'dark-theme': true,
+ backgroundColor: "#002b36",
  'web-preferences': {
- 'overlay-scrollbars': true,
+ 'overlayScrollbars': true,
  }
  };
 

diff --git a/package.js b/package.js
@@ -11,7 +11,7 @@ var devDeps = Object.keys(require('./package.json').devDependencies);
 
 
 var appName = argv.name || argv.n || 'FromScratch';
-var shouldUseAsar = argv.asar || argv.a || false;
+var shouldUseAsar = argv.asar || argv.a || true;
 var shouldBuildAll = argv.all || false;
 
 
@@ -41,7 +41,7 @@ if (version) {
  // use the same version as the currently-installed electron-prebuilt
  exec('npm list | grep electron-prebuilt', function(err, stdout, stderr) {
  if (err) {
- DEFAULT_OPTS.version = '0.34.0';
+ DEFAULT_OPTS.version = '0.36.0';
  } else {
  DEFAULT_OPTS.version = stdout.split('@')[1].replace(/\s/g, '');
  }

diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
  "css-loader": "^0.23.0",
  "del": "^2.0.1",
  "electron-packager": "^5.1.1",
- "electron-prebuilt": "^0.36.0",
+ "electron-prebuilt": "^0.36.3",
  "electron-rebuild": "^1.0.0",
  "eslint": "^1.3.1",
  "eslint-config-airbnb": "^1.0.2",