{task.title}
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 42bef39..94dda18 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,6 +1,20 @@
-body {
+:root {
+ --colour-1: #F3F3E0;
+ --colour-2: #133E87;
+ --colour-3: #608BC1;
+ --colour-4: #CBDCEB;
+ }
+
+ body {
+ background-color: var(--colour-1);
+ font-weight: bold;
font-family: 'Roboto', sans-serif;
margin: 0;
padding: 0;
- background-color: #f0f0f0;
-}
+ }
+
+html {
+ padding: 0;
+ margin: 0;
+ }
+
diff --git a/frontend/src/routes/createTask.css b/frontend/src/routes/createTask.css
index 6eb4eff..969af56 100644
--- a/frontend/src/routes/createTask.css
+++ b/frontend/src/routes/createTask.css
@@ -1,10 +1,15 @@
.createGoal {
- margin: 10px;
+ margin: 3%;
+ background-color: var();
}
.createTask__back_button {
+ margin: 1rem;
+ margin-left: 10%;
background: none;
border: none;
+ z-index: 1;
+ position: relative;
}
.createTask__back_button__image {
@@ -12,7 +17,23 @@
}
.createTask__title {
- margin: 10px 0 20px 0;
+ margin: 2% 0 2% 0;
+ text-align: center;
+ z-index: 0;
+}
+
+.createTask__main_content {
+ z-index: 0;
+ position: absolute;
+ top: 27.5%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ min-width: 100%;
+ }
+
+.createGoal form {
+ width: 75%;
+ margin: auto;
}
.createTask__form_section {
@@ -21,15 +42,36 @@
margin-bottom: 20px;
}
-.createTask__submit {
- width: 100%;
+.createGoal label {
+ width: 75%;
+ margin: auto;
+ padding-bottom: 1rem;
+}
+
+.createGoal #title{
+ width: 75%;
+ margin: auto;
+ padding: 0.5rem;
+ border-radius: 0.4rem;
+}
- background-color: #CBDCEB;
- padding: 10px;
+.createTask__submit {
+ background-color: var(--colour-3);
+ display: block;
+ width: 65%;
+ color: white;
+ font-weight: bold;
+ padding: 1rem;
+ margin: auto;
border: none;
border-radius: 10px;
}
.createTask__form_section textarea {
resize: vertical;
+ min-height: 5rem;
+ width: 75%;
+ margin: auto;
+ padding: 0.5rem;
+ border-radius: 0.3rem;
}
diff --git a/frontend/src/routes/createTask.tsx b/frontend/src/routes/createTask.tsx
index 5ed94db..7d2f154 100644
--- a/frontend/src/routes/createTask.tsx
+++ b/frontend/src/routes/createTask.tsx
@@ -41,8 +41,8 @@ const CreateTask = () => {
toast("Goal created successfully! 🎉", {type: "success"});
navigate('/');
}).catch((error) => {
- console.error('Error:', error);
- })
+ console.error('Error:', error);
+ })
};
return (
@@ -50,34 +50,36 @@ const CreateTask = () => {
-
Create Goal
+
+
Create Goal
-
+
+
);
};
diff --git a/frontend/src/routes/tasks.css b/frontend/src/routes/tasks.css
index f6625b8..0558274 100644
--- a/frontend/src/routes/tasks.css
+++ b/frontend/src/routes/tasks.css
@@ -1,11 +1,20 @@
-.tasks {
- margin: 10px;
-}
-
.tasks__title-bar {
display: flex;
justify-content: space-between;
align-items: center;
+ padding-top: 1rem;
+ padding-bottom: 1rem;
+ padding-left: 4rem;
+ padding-right: 4rem;
+ margin: auto;
+ margin-bottom: 5%;
+ background-color: var(--colour-3);
+ color: white;
+ font-size: .75rem;
+}
+
+.tasks__title-bar__logo {
+ height: 5rem;
}
.tasks__title-bar__add-task {
@@ -18,8 +27,8 @@
background-color: #CBDCEB;
- width: 40px;
- height: 40px;
+ width: 50px;
+ height: 50px;
cursor: pointer;
}
@@ -28,3 +37,37 @@
width: 20px;
height: 20px;
}
+
+.tasks_task-wrapper__title{
+ width: 75%;
+ margin: auto;
+ margin-bottom: 1.5rem;
+}
+
+.tasks__tasks-wrapper {
+ max-width: 75rem;
+ margin: auto;
+}
+
+@media (min-width: 800px) {
+ .tasks__title-bar {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding-top: 1rem;
+ padding-bottom: 1rem;
+ padding-left: 8rem;
+ padding-right: 8rem;
+ margin: auto;
+ margin-bottom: 5%;
+ background-color: var(--colour-3);
+ color: white;
+ font-size: 1rem;
+ }
+}
+
+@media (max-width: 475px) {
+ .tasks__title-bar__logo {
+ display: none;
+ }
+}
\ No newline at end of file
diff --git a/frontend/src/routes/tasks.tsx b/frontend/src/routes/tasks.tsx
index 88d5531..80cd16d 100644
--- a/frontend/src/routes/tasks.tsx
+++ b/frontend/src/routes/tasks.tsx
@@ -3,6 +3,7 @@ import {useNavigate} from "react-router-dom";
import TaskCard from "../components/taskCard.tsx";
import Task from "../types/task.ts";
import plusButton from "../assets/plus-icon.svg";
+import logo from "../assets/logo.png"
import "./tasks.css"
import {toast} from "react-toastify";
@@ -43,7 +44,8 @@ const Tasks = () => {
-
Goals
+
![Logo]({logo})
+
Make Me Study