public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00
Code Issues Releases Wiki Activity

check solarized theme or not beofre setting css

Browse Source 
solarized dark/light shares the solarized.css
This commit is contained in:
yosmoc
2017-11-09 23:10:02 +01:00
parent 2459a80e15
commit cb298b8cad
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/MarkdownPreview.js
View File

@@ -258,7 +258,9 @@ export default class MarkdownPreview extends React.Component {
theme = consts.THEMES.some((_theme) => _theme === theme) && theme !== 'default' theme = consts.THEMES.some((_theme) => _theme === theme) && theme !== 'default'
? theme ? theme
: 'elegant' : '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 () { rewriteIframe () {

12
browser/main/lib/ConfigManager.js
View File

@@ -91,7 +91,11 @@ function get () {
: 'default' : 'default'
if (config.editor.theme !== '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' : 'default'
if (newTheme !== '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', { ipcRenderer.send('config-renew', {