Merge v0.5.11

Conflicts:
	browser/main/index.js
	package.json

lib/config.js

@@ -12,7 +12,10 @@ const defaultConfig = {
   'preview-font-size': '14',
   'preview-font-family': 'Lato',
   'switch-preview': 'blur',
-  'disable-direct-write': false
+  'disable-direct-write': false,
+  'theme-ui': 'light',
+  'theme-code': 'xcode',
+  'theme-syntax': 'xcode'
 }
 const configFile = 'config.json'
 
@@ -76,4 +79,3 @@ app.on('ready', function () {
     applyConfig()
   })
 })
-

lib/finder-menu.js

@@ -2,7 +2,7 @@ const electron = require('electron')
 const BrowserWindow = electron.BrowserWindow
 
 const OSX = process.platform === 'darwin'
-const WIN = process.platform === 'win32'
+// const WIN = process.platform === 'win32'
 
 var edit = {
   label: 'Edit',

lib/finder.html

@@ -9,7 +9,7 @@
 
   <link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
   <link rel="stylesheet" href="../node_modules/devicon/devicon.min.css">
-  <link rel="stylesheet" href="../node_modules/highlight.js/styles/xcode.css">
+  <link rel="stylesheet" href="../node_modules/highlight.js/styles/xcode.css" id="hljs-css">
   <link rel="shortcut icon" href="favicon.ico">
   <link rel="stylesheet" href="../resources/katex.min.css">
 

lib/main-app.js

@@ -288,6 +288,14 @@ app.on('ready', function () {
       })
       break
     case 'linux':
+      if (process.env.DESKTOP_SESSION === 'cinnamon') {
+        finderWindow = require('./finder-window')
+        finderWindow.on('close', function (e) {
+          if (appQuit) return true
+          e.preventDefault()
+          finderWindow.hide()
+        })
+      }
       // Do nothing.
   }
 

lib/main-menu.js

@@ -4,7 +4,7 @@ const shell = electron.shell
 const mainWindow = require('./main-window')
 
 const OSX = process.platform === 'darwin'
-const WIN = process.platform === 'win32'
+// const WIN = process.platform === 'win32'
 const LINUX = process.platform === 'linux'
 
 var boost = {
@@ -201,7 +201,7 @@ var help = {
     },
     {
       label: 'Changelog',
-      click: function () { shell.openExternal('https://github.com/BoostIO/boost-releases/blob/master/changelog.md') }
+      click: function () { shell.openExternal('https://github.com/BoostIO/boost-releases') }
     }
   ]
 }

lib/main.html

@@ -6,7 +6,7 @@
 
   <link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
   <link rel="stylesheet" href="../node_modules/devicon/devicon.min.css">
-  <link rel="stylesheet" href="../node_modules/highlight.js/styles/xcode.css">
+  <link rel="stylesheet" href="../node_modules/highlight.js/styles/xcode.css" id="hljs-css">
   <link rel="shortcut icon" href="../resources/favicon.ico">
   <title>Boostnote</title>
   <link rel="stylesheet" href="../resources/katex.min.css">
@@ -56,6 +56,7 @@
   <div id="content"></div>
 
   <script src="../submodules/ace/src-min/ace.js"></script>
+  <script src="../submodules/ace/src-min/ext-themelist.js"></script>
   <script src="../resources/katex.min.js"></script>
   <script src="../compiled/react.min.js"></script>
   <script src="../compiled/react-dom.min.js"></script>