diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss index 4fa83500c..f4a9b7caa 100644 --- a/app/src/assets/scss/component/_typography.scss +++ b/app/src/assets/scss/component/_typography.scss @@ -313,6 +313,7 @@ flex: 1; display: flex; background-color: transparent; + position: relative; } [data-subtype="echarts"], @@ -555,11 +556,9 @@ user-select: none; counter-reset: linenumber; font-size: 85%; - box-sizing: border-box; font-family: var(--b3-font-family-code); - margin-right: 1em; - min-width: 1.2em; text-align: right; + position: absolute; & > span { pointer-events: none; diff --git a/app/src/protyle/render/highlightRender.ts b/app/src/protyle/render/highlightRender.ts index bf80cf537..ccfa6406e 100644 --- a/app/src/protyle/render/highlightRender.ts +++ b/app/src/protyle/render/highlightRender.ts @@ -95,6 +95,7 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN) = } else { block.firstElementChild.className = "fn__none"; block.firstElementChild.innerHTML = ""; + block.lastElementChild.removeAttribute("style"); } block.lastElementChild.innerHTML = window.hljs.highlight( codeText + (codeText.endsWith("\n") ? "" : "\n"), // https://github.com/siyuan-note/siyuan/issues/4609 @@ -147,4 +148,5 @@ export const lineNumberRender = (block: HTMLElement) => { lineNumberTemp.remove(); block.firstElementChild.innerHTML = lineNumberHTML; + block.lastElementChild.setAttribute("style", `padding-left:${block.firstElementChild.clientWidth + 16}px`); };