Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-11 07:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

bump(electron): 0.36.7 => 0.37.5

Browse source
This commit is contained in:
Ben Gotow 2016-04-12 18:42:57 -07:00
parent 08d18765d7
commit d1211ab7de
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/resources/nylas

@ -1 +1 @@
Subproject commit cd182d38de2611b2056e12433a6b3289e7e83d10
Subproject commit e0b08839a99a66d24a1b64eea4fff265d2290dd9

2
internal_packages/events/stylesheets/events.less
View file

@ -17,6 +17,8 @@
.event-header {
border-bottom: 1px solid @border-color-divider;
padding: 10px;
overflow: hidden;
text-overflow: ellipsis;
img {
margin-right: 20px;

3
internal_packages/thread-list/stylesheets/thread-list.less
View file

@ -167,7 +167,7 @@
display:flex;
align-items: center;
overflow: hidden;
.subject {
font-size: @font-size-small;
font-weight: @font-weight-normal;
@ -412,6 +412,7 @@ body.platform-win32 {
.thread-info-column {
flex: 1;
align-self: center;
overflow: hidden;
.participants-wrapper {
display: flex;

2
package.json
View file

@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/nylas/N1/issues"
},
"electronVersion": "0.36.9",
"electronVersion": "0.37.5",
"dependencies": {
"async": "^0.9",
"atom-keymap": "^6.1.1",

2
script/bootstrap
View file

@ -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-v0.36-"+targetPlatform+"-"+targetArch
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-v0.37-"+targetPlatform+"-"+targetArch
}
function bootstrap() {