From 3605acb70e30fa7c4168b9f8218946bdbfd40c19 Mon Sep 17 00:00:00 2001 From: lin onetwo Date: Tue, 25 Mar 2025 22:53:38 +0800 Subject: [PATCH] Revert "fix: list dot missing" This reverts commit 92a9bfc507c1c957f51bb97cc2424f8b5cb1236b. --- .../tiddlywiki/prosemirror/development.tid | 2 +- .../files/prosemirror-flat-list.css | 52 ++++++++++++++++--- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/plugins/tiddlywiki/prosemirror/development.tid b/plugins/tiddlywiki/prosemirror/development.tid index 7a41bb2f7..6e660187e 100755 --- a/plugins/tiddlywiki/prosemirror/development.tid +++ b/plugins/tiddlywiki/prosemirror/development.tid @@ -8,7 +8,7 @@ Downloaded from JsDelivr CDN (like `https://cdn.jsdelivr.net/npm/prosemirror-sta * [ext[prosemirror-model|https://cdn.jsdelivr.net/npm/prosemirror-model@latest/dist/index.cjs]]: v1.25.0 * [ext[prosemirror-schema-basic|https://cdn.jsdelivr.net/npm/prosemirror-schema-basic@latest/dist/index.cjs]]: v1.2.4 * [ext[prosemirror-flat-list|https://cdn.jsdelivr.net/npm/prosemirror-flat-list@latest/dist/prosemirror-flat-list.cjs]]: v0.5.4 -** [ext[prosemirror-flat-list.css|https://cdn.jsdelivr.net/npm/prosemirror-flat-list@latest/dist/style.css]] (modified, to solve its #243) +** [ext[prosemirror-flat-list.css|https://cdn.jsdelivr.net/npm/prosemirror-flat-list@latest/dist/style.css]] ** (Instead of [ext[prosemirror-schema-list|https://cdn.jsdelivr.net/npm/prosemirror-schema-list@latest/dist/index.cjs]]) * [ext[prosemirror-example-setup|https://cdn.jsdelivr.net/npm/prosemirror-example-setup@latest/dist/index.cjs]]: v1.2.3 * [ext[orderedmap|https://cdn.jsdelivr.net/npm/orderedmap@latest/dist/index.cjs]]: v2.1.1 diff --git a/plugins/tiddlywiki/prosemirror/files/prosemirror-flat-list.css b/plugins/tiddlywiki/prosemirror/files/prosemirror-flat-list.css index 0f6fba562..53a7d6229 100644 --- a/plugins/tiddlywiki/prosemirror/files/prosemirror-flat-list.css +++ b/plugins/tiddlywiki/prosemirror/files/prosemirror-flat-list.css @@ -22,17 +22,16 @@ border: 2px solid #8cf; pointer-events: none; } -.prosemirror-flat-list[data-list-kind=bullet] > .list-content > p { - display: list-item; +.prosemirror-flat-list[data-list-kind=bullet] { list-style: disc; } -.prosemirror-flat-list[data-list-kind=ordered] > .list-content > p { +.prosemirror-flat-list[data-list-kind=ordered] { counter-increment: prosemirror-flat-list-counter; } .prosemirror-flat-list[data-list-kind=ordered] > * { contain: style; } -.prosemirror-flat-list[data-list-kind=ordered] > .list-content > p::before { +.prosemirror-flat-list[data-list-kind=ordered]::before { position: absolute; right: 100%; font-variant-numeric: tabular-nums; @@ -42,6 +41,47 @@ :not(.prosemirror-flat-list[data-list-kind=ordered]) + .prosemirror-flat-list[data-list-kind=ordered] { counter-reset: prosemirror-flat-list-counter; } -[data-list-order]:is(.prosemirror-flat-list[data-list-kind=ordered]:first-child, :not(.prosemirror-flat-list[data-list-kind=ordered]) + .prosemirror-flat-list[data-list-kind=ordered]) { - counter-set: prosemirror-flat-list-counter var(--prosemirror-flat-list-order); +@supports (counter-set: prosemirror-flat-list-counter 1) { + [data-list-order]:is(.prosemirror-flat-list[data-list-kind=ordered]:first-child, :not(.prosemirror-flat-list[data-list-kind=ordered]) + .prosemirror-flat-list[data-list-kind=ordered]) { + counter-set: prosemirror-flat-list-counter var(--prosemirror-flat-list-order); + } +} +@supports not (counter-set: prosemirror-flat-list-counter 1) { + [data-list-order]:is(.prosemirror-flat-list[data-list-kind=ordered]:first-child, :not(.prosemirror-flat-list[data-list-kind=ordered]) + .prosemirror-flat-list[data-list-kind=ordered]) { + counter-increment: prosemirror-flat-list-counter var(--prosemirror-flat-list-order); + } +} +.prosemirror-flat-list[data-list-kind=task] > .list-marker { + position: absolute; + right: 100%; + text-align: center; + width: 1.5em; + width: 1lh; +} +.prosemirror-flat-list[data-list-kind=task] > .list-marker, +.prosemirror-flat-list[data-list-kind=task] > .list-marker * { + cursor: pointer; +} +.prosemirror-flat-list[data-list-kind=toggle] > .list-marker { + position: absolute; + right: 100%; + text-align: center; + width: 1.5em; + width: 1lh; +} +.prosemirror-flat-list[data-list-kind=toggle] > .list-marker::before { + content: "\23f7"; +} +.prosemirror-flat-list[data-list-kind=toggle][data-list-collapsable][data-list-collapsed] > .list-marker::before { + content: "\23f5"; +} +.prosemirror-flat-list[data-list-kind=toggle][data-list-collapsable] > .list-marker { + cursor: pointer; +} +.prosemirror-flat-list[data-list-kind=toggle]:not([data-list-collapsable]) > .list-marker { + opacity: 40%; + pointer-events: none; +} +.prosemirror-flat-list[data-list-kind=toggle][data-list-collapsable][data-list-collapsed] > .list-content > *:nth-child(n+2) { + display: none; }