fix(ci): use npm ci with legacy-peer-deps in Dockerfiles & add workflow_dispatch & fix list styles
This commit is contained in:
@@ -8,6 +8,7 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ci:
|
ci:
|
||||||
|
|||||||
1
.github/workflows/ci.yaml
vendored
1
.github/workflows/ci.yaml
vendored
@@ -8,6 +8,7 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ci:
|
ci:
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
COPY package.json package-lock.json* ./
|
COPY package.json package-lock.json* ./
|
||||||
COPY prisma ./prisma
|
COPY prisma ./prisma
|
||||||
|
|
||||||
RUN npm install
|
RUN npm ci --legacy-peer-deps
|
||||||
RUN npx prisma generate
|
RUN npx prisma generate
|
||||||
|
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY package.json package-lock.json* ./
|
COPY package.json package-lock.json* ./
|
||||||
RUN npm install
|
RUN npm ci --legacy-peer-deps
|
||||||
|
|
||||||
# We only need the socket server and dependencies
|
# We only need the socket server and dependencies
|
||||||
COPY socket-server.ts ./
|
COPY socket-server.ts ./
|
||||||
|
|||||||
@@ -1333,22 +1333,34 @@ html.font-system * {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* --- Lists --- */
|
/* --- Lists --- */
|
||||||
/* TipTap wraps list content in <p> (block). inside markers force bullet on its own line. */
|
/* TipTap wraps list item text in <p> (block). Block <p> forces the marker onto its own line. */
|
||||||
.notion-editor-wrapper .ProseMirror ul:not([data-type="taskList"]) {
|
.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-type: disc;
|
||||||
list-style-position: outside;
|
list-style-position: outside;
|
||||||
padding-inline-start: 1.5rem;
|
padding-inline-start: 1.5rem;
|
||||||
margin: 0.25em 0;
|
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-type: decimal;
|
||||||
list-style-position: outside;
|
list-style-position: outside;
|
||||||
padding-inline-start: 1.5rem;
|
padding-inline-start: 1.5rem;
|
||||||
margin: 0.25em 0;
|
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;
|
margin: 0;
|
||||||
padding-inline-start: 0;
|
padding-inline-start: 0;
|
||||||
}
|
}
|
||||||
@@ -1534,8 +1546,10 @@ html.font-system * {
|
|||||||
.notion-editor-wrapper .ProseMirror li[dir='rtl'] > p,
|
.notion-editor-wrapper .ProseMirror li[dir='rtl'] > p,
|
||||||
.fullpage-editor .ProseMirror .clip-article--rtl li > p,
|
.fullpage-editor .ProseMirror .clip-article--rtl li > p,
|
||||||
.fullpage-editor .ProseMirror li[dir='rtl'] > p {
|
.fullpage-editor .ProseMirror li[dir='rtl'] > p {
|
||||||
|
display: inline;
|
||||||
direction: rtl;
|
direction: rtl;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* --- Code --- */
|
/* --- Code --- */
|
||||||
@@ -2603,18 +2617,35 @@ html.font-system * {
|
|||||||
margin-bottom: 0.5em;
|
margin-bottom: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fullpage-editor .ProseMirror ul,
|
.fullpage-editor .ProseMirror ul:not([data-type="taskList"]),
|
||||||
.fullpage-editor .ProseMirror ol {
|
.fullpage-editor .ProseMirror ol {
|
||||||
font-size: 1.125rem;
|
font-size: 1.125rem;
|
||||||
line-height: 1.8;
|
line-height: 1.8;
|
||||||
|
list-style-position: outside;
|
||||||
padding-inline-start: 1.5em;
|
padding-inline-start: 1.5em;
|
||||||
margin-bottom: 1em;
|
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 {
|
.fullpage-editor .ProseMirror li {
|
||||||
|
display: list-item;
|
||||||
margin-bottom: 0.3em;
|
margin-bottom: 0.3em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fullpage-editor .ProseMirror li > p {
|
||||||
|
display: inline;
|
||||||
|
margin: 0;
|
||||||
|
margin-bottom: 0;
|
||||||
|
opacity: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
.fullpage-editor .ProseMirror blockquote {
|
.fullpage-editor .ProseMirror blockquote {
|
||||||
border-inline-start: 3px solid var(--foreground);
|
border-inline-start: 3px solid var(--foreground);
|
||||||
padding-inline-start: 1.25rem;
|
padding-inline-start: 1.25rem;
|
||||||
|
|||||||
Reference in New Issue
Block a user