diff --git a/.github/workflows/TASKLIST_CARBONISATION.yml b/.github/workflows/TASKLIST_CARBONISATION.yml index f0857ae45..1541582df 100644 --- a/.github/workflows/TASKLIST_CARBONISATION.yml +++ b/.github/workflows/TASKLIST_CARBONISATION.yml @@ -15,11 +15,11 @@ jobs: options: --user 1001:1000 steps: - name: Checkout form-js - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 with: path: form-js - name: Checkout Tasklist - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 with: repository: camunda/zeebe token: ${{ secrets.ADD_TO_HTO_PROJECT_PAT }} diff --git a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-chromium-linux.png b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-chromium-linux.png index 343ff8e0a..8ab0ceaf8 100644 Binary files a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-chromium-linux.png and b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-chromium-linux.png differ diff --git a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-firefox-linux.png b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-firefox-linux.png index 1f7fa097c..232b1cbd5 100644 Binary files a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-firefox-linux.png and b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-firefox-linux.png differ diff --git a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-webkit-linux.png b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-webkit-linux.png index c3f532ad6..86a871aa4 100644 Binary files a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-webkit-linux.png and b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-webkit-linux.png differ diff --git a/package-lock.json b/package-lock.json index 0784e1e02..3949130fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14213,9 +14213,9 @@ } }, "node_modules/marked": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz", - "integrity": "sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-13.0.0.tgz", + "integrity": "sha512-VTeDCd9txf4KLLljUZ0nljE/Incb9SrWuueE44QVuU0pkOdh4sfCeW1Z6lPcxyDRSVY6rm8db/0OPaN75RNUmw==", "bin": { "marked": "bin/marked.js" }, @@ -21288,7 +21288,7 @@ "flatpickr": "^4.6.13", "ids": "^1.0.5", "lodash": "^4.17.21", - "marked": "^12.0.2", + "marked": "^13.0.0", "min-dash": "^4.2.1", "preact": "^10.5.14" } @@ -22797,7 +22797,7 @@ "flatpickr": "^4.6.13", "ids": "^1.0.5", "lodash": "^4.17.21", - "marked": "^12.0.2", + "marked": "^13.0.0", "min-dash": "^4.2.1", "preact": "^10.5.14" }, @@ -31259,9 +31259,9 @@ "dev": true }, "marked": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz", - "integrity": "sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==" + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-13.0.0.tgz", + "integrity": "sha512-VTeDCd9txf4KLLljUZ0nljE/Incb9SrWuueE44QVuU0pkOdh4sfCeW1Z6lPcxyDRSVY6rm8db/0OPaN75RNUmw==" }, "mdn-data": { "version": "2.0.30", diff --git a/package.json b/package.json index 6d8bd9c65..a4f027ded 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "test:visual": "playwright test visual", "build:e2e": "vite build", "start:visual-preview": "vite preview --port 8080 --logLevel silent &", - "start:container": "docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.43.1 /bin/bash" + "start:container": "docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.44.1 /bin/bash" }, "repository": { "type": "git", diff --git a/packages/form-js-viewer/assets/form-js-base.css b/packages/form-js-viewer/assets/form-js-base.css index 94de06a04..0abef512c 100644 --- a/packages/form-js-viewer/assets/form-js-base.css +++ b/packages/form-js-viewer/assets/form-js-base.css @@ -49,6 +49,7 @@ --color-background-active: var(--cds-background-active, var(--color-grey-225-10-75)); --color-layer: var(--cds-layer, var(--cds-layer-01, var(--color-white))); --color-layer-accent: var(--cds-layer-accent, var(--color-grey-0-0-88)); + --color-background-pre: var(--cds-layer, var(--cds-layer-01, var(--color-white))); --color-icon-base: var(--cds-icon-primary, var(--color-black)); --color-icon-inverted: var(--cds-icon-inverse, var(--color-black)); @@ -66,6 +67,7 @@ --color-borders-adornment: var(--cds-border-subtle, var(--cds-border-subtle-01, var(--color-grey-225-10-85))); --color-borders-readonly: var(--cds-border-subtle, var(--color-grey-225-10-75)); --color-borders-inverted: var(--cds-border-inverse, var(--color-grey-225-10-90)); + --color-borders-pre: var(--cds-border-subtle, var(--color-grey-225-10-85)); --color-warning: var(--cds-text-error, var(--color-red-360-100-45)); --color-warning-light: var(--cds-text-error, var(--color-red-360-100-92)); @@ -833,6 +835,13 @@ white-space: nowrap; } +.fjs-container .fjs-form-field-html pre, +.fjs-container .fjs-form-field-text pre { + border: 1px solid var(--color-borders-pre); + background: var(--color-background-pre); + padding: 4px; +} + .fjs-container .fjs-taglist-anchor, .fjs-container .fjs-select-anchor, .fjs-container .fjs-timepicker-anchor { diff --git a/packages/form-js-viewer/package.json b/packages/form-js-viewer/package.json index 7da95a826..2a67fe03b 100644 --- a/packages/form-js-viewer/package.json +++ b/packages/form-js-viewer/package.json @@ -55,7 +55,7 @@ "flatpickr": "^4.6.13", "ids": "^1.0.5", "lodash": "^4.17.21", - "marked": "^12.0.2", + "marked": "^13.0.0", "min-dash": "^4.2.1", "preact": "^10.5.14" },