From e95713c1df9dcc931f03a7c9d3e4057929e12d04 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Wed, 4 Sep 2024 17:59:09 +0200 Subject: [PATCH 1/4] :bug: Fix visual integration test --- frontend/playwright/ui/visual-specs/visual-viewer.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/playwright/ui/visual-specs/visual-viewer.spec.js b/frontend/playwright/ui/visual-specs/visual-viewer.spec.js index a3eeddc82b..ef6901f702 100644 --- a/frontend/playwright/ui/visual-specs/visual-viewer.spec.js +++ b/frontend/playwright/ui/visual-specs/visual-viewer.spec.js @@ -117,7 +117,7 @@ test("User goes to the Viewer Inspect code, code tab", async ({ page }) => { }); await viewerPage.showCode(); - await viewerPage.page.getByTestId("code").click(); + await viewerPage.page.getByRole("tab", { name: "code" }).click(); await expect( viewerPage.page.getByRole("button", { name: "Copy all code" }), From 34cc2119127f2a58574dd60589610b4d64c7d0f2 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Wed, 4 Sep 2024 18:00:27 +0200 Subject: [PATCH 2/4] :wrench: Rearrange css files for compilation --- frontend/scripts/_helpers.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/scripts/_helpers.js b/frontend/scripts/_helpers.js index d4bb7182b6..e7b301b30d 100644 --- a/frontend/scripts/_helpers.js +++ b/frontend/scripts/_helpers.js @@ -115,20 +115,30 @@ export async function compileSassAll(worker) { return path.startsWith("app/main/ui/ds/"); }; + const isOldComponentSystemFile = (path) => { + return path.startsWith("app/main/ui/components/"); + }; + let files = (await fs.readdir(sourceDir, { recursive: true })).filter( isSassFile, ); const appFiles = files .filter((path) => !isDesignSystemFile(path)) + .filter((path) => !isOldComponentSystemFile(path)) .map((path) => ph.join(sourceDir, path)); + const dsFiles = files .filter(isDesignSystemFile) .map((path) => ph.join(sourceDir, path)); + const oldComponentsFiles = files + .filter(isOldComponentSystemFile) + .map((path) => ph.join(sourceDir, path)); + const procs = [compileSass(worker, "resources/styles/main-default.scss", {})]; - for (let path of [...dsFiles, ...appFiles]) { + for (let path of [...oldComponentsFiles, ...dsFiles, ...appFiles]) { const proc = limitFn(() => compileSass(worker, path, { modules: true })); procs.push(proc); } From a0bb5e5ef3e8b9d18496ad318d422382126e54ef Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Thu, 5 Sep 2024 09:41:11 +0200 Subject: [PATCH 3/4] :recycle: Remove unnecesary code --- frontend/src/app/main/ui/dashboard/team.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/ui/dashboard/team.scss b/frontend/src/app/main/ui/dashboard/team.scss index d606c40535..d914ea773c 100644 --- a/frontend/src/app/main/ui/dashboard/team.scss +++ b/frontend/src/app/main/ui/dashboard/team.scss @@ -519,10 +519,8 @@ @include bodySmallTypography; color: var(--modal-title-foreground-color); } -// TODO: This fix is temporary, the error is caused by the -// cascading order of the compiled css files. -// https://tree.taiga.io/project/penpot/task/8658 -.custom-input-checkbox.custom-input-checkbox { + +.custom-input-checkbox { align-items: flex-start; } From e36cf1d9639c51599eef567f84c8dd37cb3e6feb Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Thu, 5 Sep 2024 14:46:49 +0200 Subject: [PATCH 4/4] :bug: Fix onboarding slide after rearrange --- frontend/src/app/main/ui/onboarding/questions.cljs | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/app/main/ui/onboarding/questions.cljs b/frontend/src/app/main/ui/onboarding/questions.cljs index 00898cd2c7..a9e62c9650 100644 --- a/frontend/src/app/main/ui/onboarding/questions.cljs +++ b/frontend/src/app/main/ui/onboarding/questions.cljs @@ -372,7 +372,6 @@ [:& fm/image-radio-buttons {:options start-options :img-width "159px" :img-height "120px" - :class (stl/css :image-radio) :name :start-with :on-change on-start-change}]