diff --git a/internal_packages/thread-search/stylesheets/search-bar.less b/internal_packages/thread-search/stylesheets/search-bar.less index a631e0e77..5739ab1f3 100644 --- a/internal_packages/thread-search/stylesheets/search-bar.less +++ b/internal_packages/thread-search/stylesheets/search-bar.less @@ -36,6 +36,7 @@ } .menu .content-container { position: absolute; + top: 23px; z-index: 2; width: 100%; diff --git a/package.json b/package.json index ed8238cb8..af9f89618 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/nylas/N1/issues" }, - "electronVersion": "1.2.7", + "electronVersion": "1.4.0", "dependencies": { "async": "^0.9", "babel-core": "6.8.0", diff --git a/script/bootstrap b/script/bootstrap index 098e51a20..2ef47654e 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -48,7 +48,7 @@ function makeSqlite3Command() { // Use our local version of npm (npm 3x) to build sqlite var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"'; - return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/fts5.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/electron-v1.2-"+targetPlatform+"-"+targetArch + return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/3.1.4+fts5.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/electron-v1.4-"+targetPlatform+"-"+targetArch } function bootstrap() {