Fixes #18

.editorconfig

@@ -2,8 +2,14 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = space
-indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.{js,jsx}]
+indent_style = space
+indent_size = 2
+
+[*.scss]
+indent_style = tab
+indent_size = 2

CHANGELOG.md

@@ -1,82 +1,82 @@
-# CHANGELOG
-
-## v1.0.6
-
-### Optimize
-
-- Use `webview` to render html
-- Remove js-xss and increase conversion speed
-
-## v1.0.5
-
-### new Features
-
-- Export note as `markdown`, `html`, `pdf`
-- Export notebook
-
-### Bugfix
-
-- Cancle export
-- XSS
-
-### Optimize
-
-- Upgrade to Webpack 4.0
-- Build for chrome >= 59
-
-## v1.0.4
-
-### New Features
-
-- Optimize application colors.
-
-### BugFix
-
-- Fix bugs when downloading notes.
-
-### Others
-
-- Optimize application operations.
-
-## v1.0.3
-
-### New Features
-
-- Delete notes or notebooks on oneDrive.
-- Optimize user operation.
-
-Date: 2018.04.19 21:57:00
-
-----
-## v1.0.2
-
-### New Features
-
-- Use CodeMirror
-
-----
-
-## v1.0.1
-
-### New Features
-
-- Add Update Notification
-- Note export as markdown or html
-- Disable menu items are set in grey
-
-### Bugfix
-
-- Optimized list style
-- Fix can'not cancel the selection of text in `Windows`
-
-
-----
-
-## v1.0.0
-
-### Features
-
-- Create notebook & Write note
-- Support Markdown syntax
-- Delete & Restore
-- Synchronize with Cloud Drive(OneDrive is supported)
+# CHANGELOG
+
+## v1.0.6
+
+### Optimize
+
+- Use `webview` to render html
+- Remove js-xss and increase conversion speed
+
+## v1.0.5
+
+### new Features
+
+- Export note as `markdown`, `html`, `pdf`
+- Export notebook
+
+### Bugfix
+
+- Cancle export
+- XSS
+
+### Optimize
+
+- Upgrade to Webpack 4.0
+- Build for chrome >= 59
+
+## v1.0.4
+
+### New Features
+
+- Optimize application colors.
+
+### BugFix
+
+- Fix bugs when downloading notes.
+
+### Others
+
+- Optimize application operations.
+
+## v1.0.3
+
+### New Features
+
+- Delete notes or notebooks on oneDrive.
+- Optimize user operation.
+
+Date: 2018.04.19 21:57:00
+
+----
+## v1.0.2
+
+### New Features
+
+- Use CodeMirror
+
+----
+
+## v1.0.1
+
+### New Features
+
+- Add Update Notification
+- Note export as markdown or html
+- Disable menu items are set in grey
+
+### Bugfix
+
+- Optimized list style
+- Fix can'not cancel the selection of text in `Windows`
+
+
+----
+
+## v1.0.0
+
+### Features
+
+- Create notebook & Write note
+- Support Markdown syntax
+- Delete & Restore
+- Synchronize with Cloud Drive(OneDrive is supported)

LICENSE

@@ -671,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

app/main/index.js

@@ -74,7 +74,7 @@ function handleSquirrelEvent() {
 }
 
 // this should be placed at top of main.js to handle setup events quickly
-if (process.platform === 'win32' && handleSquirrelEvent()) {
+if (process.platform === 'win32' && handleSquirrelEvent() && process.env.NODE_ENV === 'production') {
   if (handleSquirrelEvent()) {
     // squirrel event handled and app will exit in 1000ms, so don't do anything else
     app.quit();

app/main/package.json

@@ -1,38 +1,38 @@
-{
-  "name": "yosoro",
-  "productName": "Yosoro",
-  "version": "1.0.6",
-  "description": "Beautiful Cloud Drive Markdown NoteBook Desktop App, based on React, Redux, Webpack, React Hot Loader for rapid application development",
-  "main": "./main.js",
-  "scripts": {
-    "dev:main": "cross-env NODE_ENV='development' BABEL_ENV=main electron -r babel-register ./app/main/",
-    "dev:renderer": "cross-env NODE_ENV='development' BABEL_ENV=renderer webpack-dev-server --config config/webpack.config.renderer.dev.babel.js --colors --progress",
-    "build:renderer": "cross-env NODE_ENV='production' BABEL_ENV=renderer gulp --gulpfile config/gulp.babel.js --cwd . --mode renderer",
-    "build:main": "cross-env NODE_ENV='production' BABEL_ENV=main gulp --gulpfile config/gulp.babel.js --cwd . --mode main",
-    "build:all": "concurrently \"npm run build:renderer\" \"npm run build:main\"",
-    "packager:mac:app": "electron-packager ./lib Yosoro --overwrite --platform=darwin --arch=x64 --out=out --icon=assets/icons/osx/app.icns",
-    "packager:mac:dmg":"babel-node ./scripts/packageDMG.js",
-    "packager:mac": "npm run packager:mac:app && npm run packager:mac:dmg",
-    "packager:win": "electron-packager ./lib Yosoro --overwrite --platform=win32 --arch=ia32 --out=out --icon=assets/icons/win/app.ico",
-    "packager:win:64": "electron-packager ./lib Yosoro --overwrite --platform=win32 --arch=x64 --out=out --icon=assets/icons/win/app.ico",
-    "packager:linux": "electron-packager ./lib Yosoro --overwrite --platform=linux --arch=x64 --out=out",
-    "lint": "concurrently \"eslint app config --ext .js,.jsx\" \"sass-lint -v -q\"",
-    "test": "npm run lint"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/IceEnd/Yosoro.git"
-  },
-  "author": {
-    "name": "Alchemy",
-    "email": "min@coolecho.net",
-    "url": "https://github.com/IceEnd"
-  },
-  "mac": {
-    "icon": "asstes/icons/osx/app.icns"
-  },
-  "win": {
-    "icon": "asstes/icons/win/app.ico"
-  },
-  "license": "GPL-3.0"
-}
+{
+  "name": "yosoro",
+  "productName": "Yosoro",
+  "version": "1.0.6",
+  "description": "Beautiful Cloud Drive Markdown NoteBook Desktop App, based on React, Redux, Webpack, React Hot Loader for rapid application development",
+  "main": "./main.js",
+  "scripts": {
+    "dev:main": "cross-env NODE_ENV='development' BABEL_ENV=main electron -r babel-register ./app/main/",
+    "dev:renderer": "cross-env NODE_ENV='development' BABEL_ENV=renderer webpack-dev-server --config config/webpack.config.renderer.dev.babel.js --colors --progress",
+    "build:renderer": "cross-env NODE_ENV='production' BABEL_ENV=renderer gulp --gulpfile config/gulp.babel.js --cwd . --mode renderer",
+    "build:main": "cross-env NODE_ENV='production' BABEL_ENV=main gulp --gulpfile config/gulp.babel.js --cwd . --mode main",
+    "build:all": "concurrently \"npm run build:renderer\" \"npm run build:main\"",
+    "packager:mac:app": "electron-packager ./lib Yosoro --overwrite --platform=darwin --arch=x64 --out=out --icon=assets/icons/osx/app.icns",
+    "packager:mac:dmg":"babel-node ./scripts/packageDMG.js",
+    "packager:mac": "npm run packager:mac:app && npm run packager:mac:dmg",
+    "packager:win": "electron-packager ./lib Yosoro --overwrite --platform=win32 --arch=ia32 --out=out --icon=assets/icons/win/app.ico",
+    "packager:win:64": "electron-packager ./lib Yosoro --overwrite --platform=win32 --arch=x64 --out=out --icon=assets/icons/win/app.ico",
+    "packager:linux": "electron-packager ./lib Yosoro --overwrite --platform=linux --arch=x64 --out=out",
+    "lint": "concurrently \"eslint app config --ext .js,.jsx\" \"sass-lint -v -q\"",
+    "test": "npm run lint"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/IceEnd/Yosoro.git"
+  },
+  "author": {
+    "name": "Alchemy",
+    "email": "min@coolecho.net",
+    "url": "https://github.com/IceEnd"
+  },
+  "mac": {
+    "icon": "asstes/icons/osx/app.icns"
+  },
+  "win": {
+    "icon": "asstes/icons/win/app.ico"
+  },
+  "license": "GPL-3.0"
+}

app/views/assets/scss/note.scss

@@ -584,8 +584,10 @@
 		}
 
 		.CodeMirror {
+			font-family: -apple-system, BlinkMacSystemFont, Segoe WPC, Segoe UI, HelveticaNeue-Light, Noto Sans, monospace, Microsoft YaHei, PingFang SC, Hiragino Sans GB, Source Han Sans SC, Source Han Sans CN, Source Han Sans, sans-serif;
 			background-color: #fcfdfe;
 			height: 100%;
+			font-size: 1.1rem;
 
 			.CodeMirror-gutters {
 				background-color: #fcfdfe;

config/devconfig.example.json

@@ -1,3 +1,3 @@
 {
   "extensions": []
-}
+}

package.json

@@ -85,7 +85,7 @@
     "electron": "^2.0.1",
     "electron-installer-dmg": "^1.0.0",
     "electron-packager": "^9.1.0",
-    "electron-watch": "^1.0.5",
+    "electron-watch": "^1.0.9",
     "electron-winstaller": "^2.6.4",
     "eslint": "^4.10.0",
     "eslint-config-alchemy": "^0.1.13",