Skip to content

Commit 8f337a7

Browse files
authored
Merge branch 'bpmn-io:develop' into develop
2 parents 6520e02 + 12e3071 commit 8f337a7

File tree

8 files changed

+21
-12
lines changed

8 files changed

+21
-12
lines changed

.github/workflows/TASKLIST_CARBONISATION.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
options: --user 1001:1000
1616
steps:
1717
- name: Checkout form-js
18-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
18+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
1919
with:
2020
path: form-js
2121
- name: Checkout Tasklist
22-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
22+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
2323
with:
2424
repository: camunda/zeebe
2525
token: ${{ secrets.ADD_TO_HTO_PROJECT_PAT }}
-740 Bytes
Loading
-1008 Bytes
Loading
-5 Bytes
Loading

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"test:visual": "playwright test visual",
3737
"build:e2e": "vite build",
3838
"start:visual-preview": "vite preview --port 8080 --logLevel silent &",
39-
"start:container": "docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.43.1 /bin/bash"
39+
"start:container": "docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.44.1 /bin/bash"
4040
},
4141
"repository": {
4242
"type": "git",

packages/form-js-viewer/assets/form-js-base.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
--color-background-active: var(--cds-background-active, var(--color-grey-225-10-75));
5050
--color-layer: var(--cds-layer, var(--cds-layer-01, var(--color-white)));
5151
--color-layer-accent: var(--cds-layer-accent, var(--color-grey-0-0-88));
52+
--color-background-pre: var(--cds-layer, var(--cds-layer-01, var(--color-white)));
5253

5354
--color-icon-base: var(--cds-icon-primary, var(--color-black));
5455
--color-icon-inverted: var(--cds-icon-inverse, var(--color-black));
@@ -66,6 +67,7 @@
6667
--color-borders-adornment: var(--cds-border-subtle, var(--cds-border-subtle-01, var(--color-grey-225-10-85)));
6768
--color-borders-readonly: var(--cds-border-subtle, var(--color-grey-225-10-75));
6869
--color-borders-inverted: var(--cds-border-inverse, var(--color-grey-225-10-90));
70+
--color-borders-pre: var(--cds-border-subtle, var(--color-grey-225-10-85));
6971

7072
--color-warning: var(--cds-text-error, var(--color-red-360-100-45));
7173
--color-warning-light: var(--cds-text-error, var(--color-red-360-100-92));
@@ -833,6 +835,13 @@
833835
white-space: nowrap;
834836
}
835837

838+
.fjs-container .fjs-form-field-html pre,
839+
.fjs-container .fjs-form-field-text pre {
840+
border: 1px solid var(--color-borders-pre);
841+
background: var(--color-background-pre);
842+
padding: 4px;
843+
}
844+
836845
.fjs-container .fjs-taglist-anchor,
837846
.fjs-container .fjs-select-anchor,
838847
.fjs-container .fjs-timepicker-anchor {

packages/form-js-viewer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"flatpickr": "^4.6.13",
5656
"ids": "^1.0.5",
5757
"lodash": "^4.17.21",
58-
"marked": "^12.0.2",
58+
"marked": "^13.0.0",
5959
"min-dash": "^4.2.1",
6060
"preact": "^10.5.14"
6161
},

0 commit comments

Comments
 (0)