diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index e6c6d67..fc23a15 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -8,6 +8,7 @@ on: pull_request: branches: - main + workflow_dispatch: jobs: ci: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e6c6d67..fc23a15 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ on: pull_request: branches: - main + workflow_dispatch: jobs: ci: diff --git a/memento-note/Dockerfile b/memento-note/Dockerfile index 91b2e08..9008253 100644 --- a/memento-note/Dockerfile +++ b/memento-note/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY package.json package-lock.json* ./ COPY prisma ./prisma -RUN npm install +RUN npm ci --legacy-peer-deps RUN npx prisma generate # =========================================================================== diff --git a/memento-note/Dockerfile.socket b/memento-note/Dockerfile.socket index 2766e1d..2946a03 100644 --- a/memento-note/Dockerfile.socket +++ b/memento-note/Dockerfile.socket @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* COPY package.json package-lock.json* ./ -RUN npm install +RUN npm ci --legacy-peer-deps # We only need the socket server and dependencies COPY socket-server.ts ./ diff --git a/memento-note/app/globals.css b/memento-note/app/globals.css index 50aca53..6efb01b 100644 --- a/memento-note/app/globals.css +++ b/memento-note/app/globals.css @@ -1333,22 +1333,34 @@ html.font-system * { } /* --- Lists --- */ -/* TipTap wraps list content in

(block). inside markers force bullet on its own line. */ -.notion-editor-wrapper .ProseMirror ul:not([data-type="taskList"]) { +/* TipTap wraps list item text in

(block). Block

forces the marker onto its own line. */ +.notion-editor-wrapper .ProseMirror ul:not([data-type="taskList"]), +.fullpage-editor .notion-editor-wrapper .ProseMirror ul:not([data-type="taskList"]) { list-style-type: disc; list-style-position: outside; padding-inline-start: 1.5rem; margin: 0.25em 0; } -.notion-editor-wrapper .ProseMirror ol { +.notion-editor-wrapper .ProseMirror ol, +.fullpage-editor .notion-editor-wrapper .ProseMirror ol { list-style-type: decimal; list-style-position: outside; padding-inline-start: 1.5rem; margin: 0.25em 0; } -.notion-editor-wrapper .ProseMirror li>p { +.notion-editor-wrapper .ProseMirror ul:not([data-type="taskList"]) > li, +.notion-editor-wrapper .ProseMirror ol > li, +.fullpage-editor .notion-editor-wrapper .ProseMirror ul:not([data-type="taskList"]) > li, +.fullpage-editor .notion-editor-wrapper .ProseMirror ol > li { + display: list-item; +} + +.notion-editor-wrapper .ProseMirror li > p, +.fullpage-editor .notion-editor-wrapper .ProseMirror li > p, +.fullpage-editor .ProseMirror li > p { + display: inline; margin: 0; padding-inline-start: 0; } @@ -1534,8 +1546,10 @@ html.font-system * { .notion-editor-wrapper .ProseMirror li[dir='rtl'] > p, .fullpage-editor .ProseMirror .clip-article--rtl li > p, .fullpage-editor .ProseMirror li[dir='rtl'] > p { + display: inline; direction: rtl; text-align: right; + margin: 0; } /* --- Code --- */ @@ -2603,18 +2617,35 @@ html.font-system * { margin-bottom: 0.5em; } -.fullpage-editor .ProseMirror ul, +.fullpage-editor .ProseMirror ul:not([data-type="taskList"]), .fullpage-editor .ProseMirror ol { font-size: 1.125rem; line-height: 1.8; + list-style-position: outside; padding-inline-start: 1.5em; margin-bottom: 1em; } +.fullpage-editor .ProseMirror ul:not([data-type="taskList"]) { + list-style-type: disc; +} + +.fullpage-editor .ProseMirror ol { + list-style-type: decimal; +} + .fullpage-editor .ProseMirror li { + display: list-item; margin-bottom: 0.3em; } +.fullpage-editor .ProseMirror li > p { + display: inline; + margin: 0; + margin-bottom: 0; + opacity: inherit; +} + .fullpage-editor .ProseMirror blockquote { border-inline-start: 3px solid var(--foreground); padding-inline-start: 1.25rem;