diff --git a/app/src/assets/scss/protyle/_wysiwyg.scss b/app/src/assets/scss/protyle/_wysiwyg.scss index 37158f283..4451d9df6 100644 --- a/app/src/assets/scss/protyle/_wysiwyg.scss +++ b/app/src/assets/scss/protyle/_wysiwyg.scss @@ -66,7 +66,8 @@ box-shadow: 2px 0 0 0 var(--b3-protyle-inline-mark-background) inset; } - [spellcheck] { + & > [spellcheck] { + min-height: 1.625em; word-break: break-word; // https://github.com/siyuan-note/siyuan/issues/10483 white-space: break-spaces; @@ -166,17 +167,6 @@ align-items: center; word-break: keep-all; - // https://github.com/siyuan-note/siyuan/issues/2803 - & ~ .h1, - & ~ .h2, - & ~ .h3, - & ~ .h4, - & ~ .h5, - & ~ .h6 { - padding-top: 0; - padding-bottom: 0; - } - &::after { content: ""; position: absolute; diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts index d9328f522..76ece0072 100644 --- a/app/src/util/assets.ts +++ b/app/src/util/assets.ts @@ -291,10 +291,10 @@ export const setInlineStyle = async (set = true) => { style += `\n:root{--b3-font-size-editor:${window.siyuan.config.editor.fontSize}px} .b3-typography code:not(.hljs), .protyle-wysiwyg span[data-type~=code] { font-variant-ligatures: ${window.siyuan.config.editor.codeLigatures ? "normal" : "none"} } .li > .protyle-action {height:${height + 8}px;line-height: ${height + 8}px} -.protyle-wysiwyg [data-node-id].li > .protyle-action ~ [data-type="NodeHeading"] {line-height:${height + 8}px} -.protyle-wysiwyg [data-node-id].li > .protyle-action ~ [data-type="NodeHeading"] > [spellcheck] {min-height:${height + 8}px} +/* 列表项后的内容和列表项对齐 https://github.com/siyuan-note/siyuan/issues/2803 */ +.protyle-wysiwyg [data-node-id].li > .protyle-action ~ div {line-height:${height}px} +.protyle-wysiwyg [data-node-id].li > .protyle-action ~ div > [spellcheck] {min-height:${height}px} .protyle-wysiwyg [data-node-id].li::before {height: calc(100% - ${height + 12}px);top:${(height + 12)}px} -.protyle-wysiwyg [data-node-id]:not([data-type="NodeHeading"]) > [spellcheck] {min-height:${height}px;} .protyle-wysiwyg .p, .protyle-wysiwyg .code-block .hljs, .protyle-wysiwyg .table,