public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-11 00:36:26 +00:00
Code Issues Releases Wiki Activity

avoids conflicting styles between inline codes and code blocks

Browse Source
This commit is contained in:
Baptiste Augrain
2020-12-14 19:50:34 +01:00
committed by Junyoung Choi
parent 2603dfc1ed
commit 58c4a78be1
3 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
browser/lib/markdown.js
View File

@@ -8,7 +8,7 @@ import markdownItTocAndAnchor from '@hikerpig/markdown-it-toc-and-anchor'
import _ from 'lodash' import _ from 'lodash'
import ConfigManager from 'browser/main/lib/ConfigManager' import ConfigManager from 'browser/main/lib/ConfigManager'
import katex from 'katex' import katex from 'katex'
import { lastFindInArray } from './utils' import { escapeHtmlCharacters, lastFindInArray } from './utils'
function createGutter(str, firstLineNumber) { function createGutter(str, firstLineNumber) {
if (Number.isNaN(firstLineNumber)) firstLineNumber = 1 if (Number.isNaN(firstLineNumber)) firstLineNumber = 1
@@ -479,6 +479,16 @@ class Markdown {
return true return true
}) })
this.md.renderer.rules.code_inline = function(tokens, idx) {
const token = tokens[idx]
return (
'<code class="inline">' +
escapeHtmlCharacters(token.content) +
'</code>'
)
}
if (config.preview.smartArrows) { if (config.preview.smartArrows) {
this.md.use(smartArrows) this.md.use(smartArrows)
} }

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

@@ -18,9 +18,9 @@ const DEFAULT_MARKDOWN_LINT_CONFIG = `{
const DEFAULT_CSS_CONFIG = ` const DEFAULT_CSS_CONFIG = `
/* Drop Your Custom CSS Code Here */ /* Drop Your Custom CSS Code Here */
[data-theme="default"] p code, [data-theme="default"] p code.inline,
[data-theme="default"] li code, [data-theme="default"] li code.inline,
[data-theme="default"] td code [data-theme="default"] td code.inline
{ {
padding: 2px; padding: 2px;
border-width: 1px; border-width: 1px;

54
browser/main/lib/dataApi/formatHTML.js
View File

@@ -638,74 +638,74 @@ code {
direction: ltr; direction: ltr;
} }
p code, p code.inline,
li code, li code.inline,
td code td code.inline
{ {
padding: 2px; padding: 2px;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-radius: 5px; border-radius: 5px;
} }
[data-theme="default"] p code, [data-theme="default"] p code.inline,
[data-theme="default"] li code, [data-theme="default"] li code.inline,
[data-theme="default"] td code [data-theme="default"] td code.inline
{ {
background-color: #F4F4F4; background-color: #F4F4F4;
border-color: #d9d9d9; border-color: #d9d9d9;
color: inherit; color: inherit;
} }
[data-theme="white"] p code, [data-theme="white"] p code.inline,
[data-theme="white"] li code, [data-theme="white"] li code.inline,
[data-theme="white"] td code [data-theme="white"] td code.inline
{ {
background-color: #F4F4F4; background-color: #F4F4F4;
border-color: #d9d9d9; border-color: #d9d9d9;
color: inherit; color: inherit;
} }
[data-theme="dark"] p code, [data-theme="dark"] p code.inline,
[data-theme="dark"] li code, [data-theme="dark"] li code.inline,
[data-theme="dark"] td code [data-theme="dark"] td code.inline
{ {
background-color: #444444; background-color: #444444;
border-color: #555; border-color: #555;
color: #FFFFFF; color: #FFFFFF;
} }
[data-theme="dracula"] p code, [data-theme="dracula"] p code.inline,
[data-theme="dracula"] li code, [data-theme="dracula"] li code.inline,
[data-theme="dracula"] td code [data-theme="dracula"] td code.inline
{ {
background-color: #444444; background-color: #444444;
border-color: #555; border-color: #555;
color: #FFFFFF; color: #FFFFFF;
} }
[data-theme="monokai"] p code, [data-theme="monokai"] p code.inline,
[data-theme="monokai"] li code, [data-theme="monokai"] li code.inline,
[data-theme="monokai"] td code [data-theme="monokai"] td code.inline
{ {
background-color: #444444; background-color: #444444;
border-color: #555; border-color: #555;
color: #FFFFFF; color: #FFFFFF;
} }
[data-theme="nord"] p code, [data-theme="nord"] p code.inline,
[data-theme="nord"] li code, [data-theme="nord"] li code.inline,
[data-theme="nord"] td code [data-theme="nord"] td code.inline
{ {
background-color: #444444; background-color: #444444;
border-color: #555; border-color: #555;
color: #FFFFFF; color: #FFFFFF;
} }
[data-theme="solarized-dark"] p code, [data-theme="solarized-dark"] p code.inline,
[data-theme="solarized-dark"] li code, [data-theme="solarized-dark"] li code.inline,
[data-theme="solarized-dark"] td code [data-theme="solarized-dark"] td code.inline
{ {
background-color: #444444; background-color: #444444;
border-color: #555; border-color: #555;
color: #FFFFFF; color: #FFFFFF;
} }
[data-theme="vulcan"] p code, [data-theme="vulcan"] p code.inline,
[data-theme="vulcan"] li code, [data-theme="vulcan"] li code.inline,
[data-theme="vulcan"] td code [data-theme="vulcan"] td code.inline
{ {
background-color: #444444; background-color: #444444;
border-color: #555; border-color: #555;