diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss index 1fc564d01..a2fae6557 100644 --- a/app/src/assets/scss/component/_typography.scss +++ b/app/src/assets/scss/component/_typography.scss @@ -6,6 +6,8 @@ .b3-typography, .protyle-wysiwyg { font-variant-ligatures: no-common-ligatures; + display: flex; + flex-direction: column; img { max-width: 100%; @@ -22,7 +24,7 @@ [data-node-id] { line-height: 1.625; padding: 4px; - margin: 4px 0; + margin: 2px 0; border-radius: var(--b3-border-radius); } diff --git a/app/src/assets/scss/protyle/_wysiwyg.scss b/app/src/assets/scss/protyle/_wysiwyg.scss index ecb9b6c07..a4de4630a 100644 --- a/app/src/assets/scss/protyle/_wysiwyg.scss +++ b/app/src/assets/scss/protyle/_wysiwyg.scss @@ -1,8 +1,6 @@ .protyle-wysiwyg { padding: 34px 16px 16px 24px; cursor: text; - display: flex; - flex-direction: column; box-sizing: border-box; user-select: auto; overflow-x: clip; diff --git a/app/src/protyle/render/highlightRender.ts b/app/src/protyle/render/highlightRender.ts index e296e2d00..9df65d9f5 100644 --- a/app/src/protyle/render/highlightRender.ts +++ b/app/src/protyle/render/highlightRender.ts @@ -35,8 +35,10 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN) = addScript(`${cdn}/js/highlight.js/third-languages.js?v=1.0.1`, "protyleHljsThirdScript").then(() => { codeElements.forEach((block: HTMLElement) => { const iconElements = block.parentElement.querySelectorAll(".protyle-icon"); - iconElements[0].setAttribute("aria-label", window.siyuan.languages.copy); - iconElements[1].setAttribute("aria-label", window.siyuan.languages.more); + if (iconElements.length === 2) { + iconElements[0].setAttribute("aria-label", window.siyuan.languages.copy); + iconElements[1].setAttribute("aria-label", window.siyuan.languages.more); + } if (block.getAttribute("data-render") === "true") { return; }