From 68aa9f69b5a63c7edbf496924123823c4404b9c6 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 22 Feb 2023 11:02:56 +0100 Subject: [PATCH 1/2] fix: forms have better visibility on iPhone --- src/styles/resets/_mat-input.scss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/styles/resets/_mat-input.scss b/src/styles/resets/_mat-input.scss index dc44571d60..ef0b3478ff 100644 --- a/src/styles/resets/_mat-input.scss +++ b/src/styles/resets/_mat-input.scss @@ -1,12 +1,10 @@ @use "@angular/material" as mat; /* display disabled form values in black for better readability as we disable forms by default */ -.mat-mdc-input-element:disabled { - color: mat.get-color-from-palette(mat.$light-theme-foreground-palette, text) !important; -} - -.mat-mdc-select-disabled .mat-mdc-select-value { +.mat-mdc-select-disabled .mat-mdc-select-value, .mat-mdc-input-element:disabled { color: mat.get-color-from-palette(mat.$light-theme-foreground-palette, text) !important; + -webkit-text-fill-color: black; + opacity: 1; } .mdc-text-field--filled { From 706b99f38ff7413932cb9e7fe8adcff7aeb15bff Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 2 Mar 2023 10:30:39 +0100 Subject: [PATCH 2/2] improved e2e test --- e2e/integration/MarkingChildAsDropout.cy.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/e2e/integration/MarkingChildAsDropout.cy.ts b/e2e/integration/MarkingChildAsDropout.cy.ts index 83b6af527d..6a1a9536af 100644 --- a/e2e/integration/MarkingChildAsDropout.cy.ts +++ b/e2e/integration/MarkingChildAsDropout.cy.ts @@ -1,7 +1,8 @@ describe("Scenario: Marking a child as dropout - E2E test", function () { before("GIVEN I am on the details page of a specific child", function () { - // go to the url with the Child - cy.visit("child/1"); + // go to a child + cy.visit("child"); + cy.get("tr").eq(2).click(); // save the name of this Child to the variable cy.get(".mat-title > .remove-margin-bottom").invoke("text").as("childName"); }); @@ -15,9 +16,7 @@ describe("Scenario: Marking a child as dropout - E2E test", function () { cy.get('[aria-label="Open calendar"]').filter(":visible").click(); cy.get(".mat-calendar-body-active:visible").click(); // click on button with the content "Save" - cy.get(".form-buttons-wrapper:visible", { timeout: 10000 }) - .contains("button", "Save") - .click(); + cy.get(".form-buttons-wrapper:visible").contains("button", "Save").click(); }); it("THEN I should not see this child in the list of all children at first", function () {