From 2459a80e1557e1147e2d0b458b7cbd13b487bd43 Mon Sep 17 00:00:00 2001
From: yosmoc <motihara@gmail.com>
Date: Mon, 6 Nov 2017 23:32:45 +0100
Subject: [PATCH 1/3] solarized light/dark bug fix

fixup for 0bf7e8b705793f432545c204749526d457547552
ConfigManager is also needed to change.
---
 browser/main/lib/ConfigManager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index fd374cf14..aa8c85e4f 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -91,7 +91,7 @@ function get () {
       : 'default'
 
     if (config.editor.theme !== 'default') {
-      editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + config.editor.theme + '.css')
+      editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + config.editor.theme.split(' ')[0] + '.css')
     }
   }
 
@@ -122,7 +122,7 @@ function set (updates) {
     : 'default'
 
   if (newTheme !== 'default') {
-    editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + newTheme + '.css')
+    editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + newTheme.split(' ')[0] + '.css')
   }
 
   ipcRenderer.send('config-renew', {

From cb298b8cadf21eb0b517a0158a7dd9aa30ee055f Mon Sep 17 00:00:00 2001
From: yosmoc <motihara@gmail.com>
Date: Thu, 9 Nov 2017 23:10:02 +0100
Subject: [PATCH 2/3] check solarized theme or not beofre setting css

solarized dark/light shares the solarized.css
---
 browser/components/MarkdownPreview.js |  4 +++-
 browser/main/lib/ConfigManager.js     | 12 ++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 6f0846a68..2994df757 100644
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -258,7 +258,9 @@ export default class MarkdownPreview extends React.Component {
     theme = consts.THEMES.some((_theme) => _theme === theme) && theme !== 'default'
       ? theme
       : 'elegant'
-    this.getWindow().document.getElementById('codeTheme').href = `${appPath}/node_modules/codemirror/theme/${theme.split(' ')[0]}.css`
+    this.getWindow().document.getElementById('codeTheme').href = theme.startsWith('solarized')
+      ? `${appPath}/node_modules/codemirror/theme/${theme.split(' ')[0]}.css`
+      : `${appPath}/node_modules/codemirror/theme/${theme}.css`
   }
 
   rewriteIframe () {
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index aa8c85e4f..738c2e2e3 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -91,7 +91,11 @@ function get () {
       : 'default'
 
     if (config.editor.theme !== 'default') {
-      editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + config.editor.theme.split(' ')[0] + '.css')
+      if (config.editor.theme.startsWith('solarized')) {
+        editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + config.editor.theme.split(' ')[0] + '.css')
+      } else {
+        editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + config.editor.theme + '.css')
+      }
     }
   }
 
@@ -122,7 +126,11 @@ function set (updates) {
     : 'default'
 
   if (newTheme !== 'default') {
-    editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + newTheme.split(' ')[0] + '.css')
+    if (newTheme.startsWith('solarized')) {
+      editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + newTheme.split(' ')[0] + '.css')
+    } else {
+      editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + newTheme + '.css')
+    }
   }
 
   ipcRenderer.send('config-renew', {

From dbc0fedf43c567e696dbeb16d9e40770ce91f7a8 Mon Sep 17 00:00:00 2001
From: yosmoc <motihara@gmail.com>
Date: Sat, 11 Nov 2017 23:17:00 +0100
Subject: [PATCH 3/3] improve readability

---
 browser/components/MarkdownPreview.js | 2 +-
 browser/main/lib/ConfigManager.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 2994df757..4d87e017d 100644
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -259,7 +259,7 @@ export default class MarkdownPreview extends React.Component {
       ? theme
       : 'elegant'
     this.getWindow().document.getElementById('codeTheme').href = theme.startsWith('solarized')
-      ? `${appPath}/node_modules/codemirror/theme/${theme.split(' ')[0]}.css`
+      ? `${appPath}/node_modules/codemirror/theme/solarized.css`
       : `${appPath}/node_modules/codemirror/theme/${theme}.css`
   }
 
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 738c2e2e3..a516978ee 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -92,7 +92,7 @@ function get () {
 
     if (config.editor.theme !== 'default') {
       if (config.editor.theme.startsWith('solarized')) {
-        editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + config.editor.theme.split(' ')[0] + '.css')
+        editorTheme.setAttribute('href', '../node_modules/codemirror/theme/solarized.css')
       } else {
         editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + config.editor.theme + '.css')
       }
@@ -127,7 +127,7 @@ function set (updates) {
 
   if (newTheme !== 'default') {
     if (newTheme.startsWith('solarized')) {
-      editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + newTheme.split(' ')[0] + '.css')
+      editorTheme.setAttribute('href', '../node_modules/codemirror/theme/solarized.css')
     } else {
       editorTheme.setAttribute('href', '../node_modules/codemirror/theme/' + newTheme + '.css')
     }