From ecff5313a16d0efd6a9e2a5a383ab75f3fec326c Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Mon, 21 Nov 2022 17:38:34 -0800 Subject: [PATCH 1/4] increase timeout for e2e tests Signed-off-by: Arthur Lu --- source/assets/scripts/main.e2e.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/assets/scripts/main.e2e.test.js b/source/assets/scripts/main.e2e.test.js index 11fe130..4181d2f 100644 --- a/source/assets/scripts/main.e2e.test.js +++ b/source/assets/scripts/main.e2e.test.js @@ -171,7 +171,7 @@ describe("test App end to end", async () => { let save_btn = await page.$("#save-btn"); await save_btn.click(); await page.waitForNavigation(); - }); + }).timeout(10000); it("check details page", async () => { // check the details page for correctness From 1dfd8c91a29f22fd65c0d6d6eb6eb729e43db339 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Mon, 21 Nov 2022 17:55:44 -0800 Subject: [PATCH 2/4] fix css linting issues Signed-off-by: Arthur Lu --- source/static/CreatePage.css | 2 +- source/static/Form.css | 9 +++++++-- source/static/ReviewDetails.css | 2 +- source/static/homepage.css | 23 ++--------------------- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/source/static/CreatePage.css b/source/static/CreatePage.css index 4172bdc..0fee1bc 100644 --- a/source/static/CreatePage.css +++ b/source/static/CreatePage.css @@ -26,5 +26,5 @@ body { text-align: center; color: #516754; font-size: 6rem; - font-family: testFont; + font-family: testFont, sans-serif; } diff --git a/source/static/Form.css b/source/static/Form.css index 253cb7e..0b34fa2 100644 --- a/source/static/Form.css +++ b/source/static/Form.css @@ -1,11 +1,16 @@ -.journal-form h1 { +@font-face { font-family: testFont; + src: url("CoveredByYourGrace-Regular.ttf"); +} + +.journal-form h1 { + font-family: testFont, sans-serif; text-align: center; } .journal-form { font-size: 120%; - font-family: "Century Gothic"; + font-family: "Century Gothic", sans-serif; width: 50%; margin: auto; color: #516754; diff --git a/source/static/ReviewDetails.css b/source/static/ReviewDetails.css index a03b7c9..4b92b4d 100644 --- a/source/static/ReviewDetails.css +++ b/source/static/ReviewDetails.css @@ -32,7 +32,7 @@ h1 { /* color: #e4c3d2; */ color: #516754; font-size: 6rem; - font-family: testFont; + font-family: testFont, sans-serif; } .d-tag { diff --git a/source/static/homepage.css b/source/static/homepage.css index cc9f934..ff575b4 100644 --- a/source/static/homepage.css +++ b/source/static/homepage.css @@ -34,7 +34,7 @@ body { /* color: rgb(145, 124, 175); */ color: #516754; font-size: 6rem; - font-family: testFont; + font-family: testFont, sans-serif; } .body-container { @@ -70,26 +70,7 @@ body { text-align: center; font-size: 4rem; color: #516754; - font-family: testFont; -} - -img#create-btn { - position: relative; - align-self: center; - padding-left: 2.5%; - padding-right: 2.5%; -} - -.review-container { - display: flex; - position: relative; - flex-wrap: wrap; - justify-content: center; -} - -.review-container > div { - background-color: #f1f1f1; - text-align: center; + font-family: testFont, sans-serif; } img#create-btn { From 5ba0dab1a12a15c6d230311ac64929491085eb35 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Mon, 21 Nov 2022 18:00:58 -0800 Subject: [PATCH 3/4] fix flex-flow css linting issue Signed-off-by: Arthur Lu --- source/static/Form.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/static/Form.css b/source/static/Form.css index 0b34fa2..62774ca 100644 --- a/source/static/Form.css +++ b/source/static/Form.css @@ -38,8 +38,7 @@ input[type="text"]:focus { .rating { display: flex; - flex-wrap: nowrap; - flex-direction: row-reverse; + flex-flow: nowrap row-reverse; } .hidden, @@ -91,8 +90,7 @@ input[type="text"]:focus { .tag-container { display: flex; - flex-direction: row; - flex-wrap: wrap; + flex-flow: nowrap row-reverse; } .tag { From 83a03588695046309a8be852292e9364a3e06e59 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Tue, 22 Nov 2022 14:46:01 -0800 Subject: [PATCH 4/4] fix form tag wrap issue Signed-off-by: Arthur Lu --- source/static/Form.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/static/Form.css b/source/static/Form.css index 62774ca..3ca3c7a 100644 --- a/source/static/Form.css +++ b/source/static/Form.css @@ -90,7 +90,7 @@ input[type="text"]:focus { .tag-container { display: flex; - flex-flow: nowrap row-reverse; + flex-flow: wrap row; } .tag {