alu/cse110-fa22-group29
1
0
Fork 0
mirror of https://github.com/cse110-fa22-group29/cse110-fa22-group29.git synced 2025-10-30 19:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sprint-2' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2

Browse Source
This commit is contained in:
look-its-ashton
2022-11-27 17:07:34 -08:00
parent c381bd1f60 83a0358869
commit 57be3a11ed
5 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/assets/scripts/main.e2e.test.js
View File

@@ -171,7 +171,7 @@ describe("test App end to end", async () => {
let save_btn = await page.$("#save-btn"); let save_btn = await page.$("#save-btn");
await save_btn.click(); await save_btn.click();
await page.waitForNavigation(); await page.waitForNavigation();
}); }).timeout(10000);
it("check details page", async () => { it("check details page", async () => {
// check the details page for correctness // check the details page for correctness

2
source/static/CreatePage.css
View File

@@ -26,5 +26,5 @@ body {
text-align: center; text-align: center;
color: #516754; color: #516754;
font-size: 6rem; font-size: 6rem;
font-family: testFont; font-family: testFont, sans-serif;
} }

15
source/static/Form.css
View File

@@ -1,11 +1,16 @@
.journal-form h1 { @font-face {
font-family: testFont; font-family: testFont;
src: url("CoveredByYourGrace-Regular.ttf");
}
.journal-form h1 {
font-family: testFont, sans-serif;
text-align: center; text-align: center;
} }
.journal-form { .journal-form {
font-size: 120%; font-size: 120%;
font-family: "Century Gothic"; font-family: "Century Gothic", sans-serif;
width: 50%; width: 50%;
margin: auto; margin: auto;
color: #516754; color: #516754;
@@ -33,8 +38,7 @@ input[type="text"]:focus {
.rating { .rating {
display: flex; display: flex;
flex-wrap: nowrap; flex-flow: nowrap row-reverse;
flex-direction: row-reverse;
} }
.hidden, .hidden,
@@ -86,8 +90,7 @@ input[type="text"]:focus {
.tag-container { .tag-container {
display: flex; display: flex;
flex-direction: row; flex-flow: wrap row;
flex-wrap: wrap;
} }
.tag { .tag {

2
source/static/ReviewDetails.css
View File

@@ -32,7 +32,7 @@ h1 {
/* color: #e4c3d2; */ /* color: #e4c3d2; */
color: #516754; color: #516754;
font-size: 6rem; font-size: 6rem;
font-family: testFont; font-family: testFont, sans-serif;
} }
.d-tag { .d-tag {

23
source/static/homepage.css
View File

@@ -34,7 +34,7 @@ body {
/* color: rgb(145, 124, 175); */ /* color: rgb(145, 124, 175); */
color: #516754; color: #516754;
font-size: 6rem; font-size: 6rem;
font-family: testFont; font-family: testFont, sans-serif;
} }
.body-container { .body-container {
@@ -70,26 +70,7 @@ body {
text-align: center; text-align: center;
font-size: 4rem; font-size: 4rem;
color: #516754; color: #516754;
font-family: testFont; font-family: testFont, sans-serif;
}
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;
} }
img#create-btn { img#create-btn {