Desktop: Resolves #2894: Set editor color scheme according to theme (#3188)

* conflicts fixed and changes made to aceEditor.tsx

* theme imported

ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx

@@ -37,8 +37,10 @@ require('brace/theme/solarized_dark');
 require('brace/theme/twilight');
 require('brace/theme/dracula');
 require('brace/theme/chaos');
+require('brace/theme/tomorrow');
 require('brace/keybinding/vim');
 require('brace/keybinding/emacs');
+require('brace/keybinding/terminal');
 
 // TODO: Could not get below code to work
 

ElectronClient/gui/style/theme/nord.js

@@ -77,7 +77,7 @@ const nordStyle = {
 	htmlCodeBorderColor: nord[2],
 	htmlCodeColor: nord[13],
 
-	editorTheme: 'chaos',
+	editorTheme: 'terminal',
 	codeThemeCss: 'atom-one-dark-reasonable.css',
 };
 

ElectronClient/gui/style/theme/solarizedDark.js

@@ -31,7 +31,7 @@ const solarizedDarkStyle = {
 	htmlCodeBorderColor: '#696969',
 	htmlCodeColor: '#fdf6e3',
 
-	editorTheme: 'solarized_dark',
+	editorTheme: 'twilight',
 	codeThemeCss: 'atom-one-dark-reasonable.css',
 };
 

ElectronClient/gui/style/theme/solarizedLight.js

@@ -31,7 +31,7 @@ const solarizedLightStyle = {
 	htmlCodeBorderColor: '#eee8d5',
 	htmlCodeColor: '#002b36',
 
-	editorTheme: 'solarized_light',
+	editorTheme: 'tomorrow',
 	codeThemeCss: 'atom-one-light.css',
 };