From b6109b04d836ab8082b68be54102b89ff811a343 Mon Sep 17 00:00:00 2001 From: lucywalt Date: Tue, 1 Apr 2025 18:46:15 -0700 Subject: [PATCH 1/3] Added new description to login page --- frontend/react-app/src/pages/Login.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/react-app/src/pages/Login.jsx b/frontend/react-app/src/pages/Login.jsx index a694225..f221645 100644 --- a/frontend/react-app/src/pages/Login.jsx +++ b/frontend/react-app/src/pages/Login.jsx @@ -12,7 +12,7 @@ function Login(){ logo

Taskly

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum condimentum nulla pharetra, ultrices mauris ut, pharetra massa. Morbi sodales in metus in porta. Morbi vel semper ligula, at dignissim eros. Aenean sollicitudin, diam et cursus elementum, elit dui viverra leo, et commodo tortor urna et dolor

+

Streamline teamwork with smart task management. Assign, prioritize, and track tasks across multiple teams. Collaborate seamlessly, stay organized with automated notifications, and keep projects moving forward effortlessly.

From 275a480d97b605077a96f86a6425d07facd4cb00 Mon Sep 17 00:00:00 2001 From: lucywalt Date: Tue, 1 Apr 2025 19:20:11 -0700 Subject: [PATCH 2/3] Changed some colours on homepage --- frontend/react-app/src/css/Header.css | 2 +- frontend/react-app/src/css/TaskList.css | 3 ++- frontend/react-app/src/css/home.css | 17 ++++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/frontend/react-app/src/css/Header.css b/frontend/react-app/src/css/Header.css index 2657bec..3c4f186 100644 --- a/frontend/react-app/src/css/Header.css +++ b/frontend/react-app/src/css/Header.css @@ -10,7 +10,7 @@ h1.inner-header{ padding: 1% 5%;; height: auto; min-height: 10%; - background-color: #3b3355; + background-color: #2d2644; display: flex; align-items: center; justify-content: space-between; diff --git a/frontend/react-app/src/css/TaskList.css b/frontend/react-app/src/css/TaskList.css index 444602c..b6d64d1 100644 --- a/frontend/react-app/src/css/TaskList.css +++ b/frontend/react-app/src/css/TaskList.css @@ -13,7 +13,8 @@ th,td{ background-color: white; } thead th{ - background-color: #437676; + /* background-color: #437676; */ + background-color: #52799d; } .tableHeader :hover{ background-color: darkslategray; diff --git a/frontend/react-app/src/css/home.css b/frontend/react-app/src/css/home.css index 13e825e..518a955 100644 --- a/frontend/react-app/src/css/home.css +++ b/frontend/react-app/src/css/home.css @@ -101,6 +101,21 @@ tbody { .pageContainer { /* background-color: #f6edff; */ - background-color: #cfe1fb; + background-color: white; width: 100%; +} + +#taskSection input { + /* background-color: #ddd3ef; */ + background-color: #d3d4f9; + color: black; +} + +#taskSection input::placeholder { + color: black; +} + +#taskSection select { + /* background-color: #ddd3ef; */ + background-color: #d3d4f9; } \ No newline at end of file From 1e568a1c7d1a68786ec55a3ac0f330bb673c09b8 Mon Sep 17 00:00:00 2001 From: lucywalt Date: Tue, 1 Apr 2025 19:49:58 -0700 Subject: [PATCH 3/3] Changed login font and home page borders --- frontend/react-app/src/css/TaskList.css | 20 ++++++++++++++++++-- frontend/react-app/src/css/home.css | 10 ++++++++-- frontend/react-app/src/login.css | 8 +++++++- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/frontend/react-app/src/css/TaskList.css b/frontend/react-app/src/css/TaskList.css index b6d64d1..36f1347 100644 --- a/frontend/react-app/src/css/TaskList.css +++ b/frontend/react-app/src/css/TaskList.css @@ -8,6 +8,16 @@ table{ overflow: hidden; box-shadow: 0 0 15px rgba(0, 0, 0, 0.1); } + +.taskTable { + border-collapse: collapse; + border: none; +} + +table td, table th { + border: 1px solid grey; /* Keeps inner borders */ +} + th,td{ padding:10px; background-color: white; @@ -17,11 +27,12 @@ thead th{ background-color: #52799d; } .tableHeader :hover{ - background-color: darkslategray; + background-color: #3d6285; } .link :hover{ background-color: darkslategray; } + .selector{ padding: 2px; height: 100%; @@ -32,6 +43,7 @@ thead th{ width: 75% !important; height: 100%; margin-left: 10px; + border-radius: 20px; } .Selector-Search{ padding: 3px; @@ -54,7 +66,7 @@ thead th{ flex: 1; padding: 0.75rem 1rem; border: none; - border-radius: 4px; + border-radius: 10px; color: rgb(0, 0, 0); font-size: 1rem; background-color: white; @@ -64,4 +76,8 @@ thead th{ color: black; text-decoration: underline; color: #0f145b; + } + + #searchThis { + color: red; } \ No newline at end of file diff --git a/frontend/react-app/src/css/home.css b/frontend/react-app/src/css/home.css index 518a955..ed98210 100644 --- a/frontend/react-app/src/css/home.css +++ b/frontend/react-app/src/css/home.css @@ -108,14 +108,20 @@ tbody { #taskSection input { /* background-color: #ddd3ef; */ background-color: #d3d4f9; - color: black; + color: #2d2644; } #taskSection input::placeholder { - color: black; + color: #2d2644; + font-size: 1em; } + #taskSection select { /* background-color: #ddd3ef; */ background-color: #d3d4f9; + color: #2d2644; + font-size: 1em; + padding-left: 1%; + border-radius: 10px; } \ No newline at end of file diff --git a/frontend/react-app/src/login.css b/frontend/react-app/src/login.css index 6c3b884..3d4aae2 100644 --- a/frontend/react-app/src/login.css +++ b/frontend/react-app/src/login.css @@ -94,8 +94,9 @@ } #logoBox h1 { - font-weight: bold; + font-weight: 900; font-size: 3em; + font-family:'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; /* background-color: red; */ gap: 0px; } @@ -103,4 +104,9 @@ #logoBox img { margin: 0; /* background-color: red; */ +} + +#siteName p { + font-size: 1.25em; + padding-left: 4%; } \ No newline at end of file