Skip to content

Home page & login changes #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taoTimTim merged 3 commits into from
Apr 2, 2025
Merged

Home page & login changes #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6109b0
Added new description to login page
lucywalt Apr 2, 2025
275a480
Changed some colours on homepage
lucywalt Apr 2, 2025
1e568a1
Changed login font and home page borders
lucywalt Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/react-app/src/css/Header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
23 changes: 20 additions & 3 deletions frontend/react-app/src/css/TaskList.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,31 @@ 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;
}
thead th{
background-color: #437676;
/* background-color: #437676; */
background-color: #52799d;
}
.tableHeader :hover{
background-color: darkslategray;
background-color: #3d6285;
}
.link :hover{
background-color: darkslategray;
}

.selector{
padding: 2px;
height: 100%;
Expand All @@ -31,6 +43,7 @@ thead th{
width: 75% !important;
height: 100%;
margin-left: 10px;
border-radius: 20px;
}
.Selector-Search{
padding: 3px;
Expand All @@ -53,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;
Expand All @@ -63,4 +76,8 @@ thead th{
color: black;
text-decoration: underline;
color: #0f145b;
}

#searchThis {
color: red;
}
23 changes: 22 additions & 1 deletion frontend/react-app/src/css/home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,27 @@ tbody {

.pageContainer {
/* background-color: #f6edff; */
background-color: #cfe1fb;
background-color: white;
width: 100%;
}

#taskSection input {
/* background-color: #ddd3ef; */
background-color: #d3d4f9;
color: #2d2644;
}

#taskSection input::placeholder {
color: #2d2644;
font-size: 1em;
}


#taskSection select {
/* background-color: #ddd3ef; */
background-color: #d3d4f9;
color: #2d2644;
font-size: 1em;
padding-left: 1%;
border-radius: 10px;
}
8 changes: 7 additions & 1 deletion frontend/react-app/src/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,19 @@
}

#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;
}

#logoBox img {
margin: 0;
/* background-color: red; */
}

#siteName p {
font-size: 1.25em;
padding-left: 4%;
}
2 changes: 1 addition & 1 deletion frontend/react-app/src/pages/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function Login(){
<img src={logo} alt="logo"/>
<h1>Taskly</h1>
</div>
<p>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</p>
<p>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.</p>
</div>
<div id="loginFormWrapper">
<LoginForm />
Expand Down