Skip to content
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.

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

Responisiveness #63

Merged
merged 3 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added web-app/src/Assets/images/EathubL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
2 changes: 2 additions & 0 deletions web-app/src/Components/FifthSec/FifthSec.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@

.timeImg {
width: 100%;
margin-left: 0;
margin-top: 0;
}
28 changes: 4 additions & 24 deletions web-app/src/Components/FirstSec/FirstSec.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.FirstSection {
height: 80vh;
height: 100vh;
background: url("../../Assets/images/foods.png");
background-size: cover;
background-position: center;
Expand All @@ -15,13 +15,13 @@
}

.heroP {
font-family: Open Sans;
font-size: 2rem;
font-family: Montserrat;
font-size: 2.5rem;
font-style: normal;
font-weight: 700;
line-height: normal;
letter-spacing: -1.28px;
width: 90%;
width: 70%;
text-align: center;
color: #fff;
}
Expand Down Expand Up @@ -58,23 +58,3 @@
}


@media (max-width: 768px) {
.FirstSection {
height: auto;
padding: 10px;
}
}

@media (max-width: 480px) {
.heroP {
font-size: 1.5rem;
}

.heroP2 {
font-size: 1rem;
}

.firstbtn {
padding: 10px 20px; /* Adjust padding for smaller screens */
}
}
2 changes: 1 addition & 1 deletion web-app/src/Components/FirstSec/FirstSec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ const FirstSec = () => {
)
}

export default FirstSec;
export default FirstSec;
19 changes: 18 additions & 1 deletion web-app/src/Components/FourthSec/FourthSec.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
justify-content: center;
align-items: center;
padding: 50px;
width: 100vw;
}

.FourthSection h2 {
Expand All @@ -15,6 +16,9 @@
font-weight: 700;
line-height: normal;
letter-spacing: -0.96px;
width: 100vw;
display: flex;
justify-content: center;
}

.FourthSection p {
Expand All @@ -24,5 +28,18 @@
font-size: 20px;
font-style: normal;
font-weight: 500;
line-height: 40px;
line-height: 35px;
width: 100vw;
display: flex;
justify-content: center;
padding: 50px;
padding-top: 0;
}

@media screen and (max-width: 768px){
.FourthSection p{
font-size: 15px;
font-weight: 400;
line-height: 25px;
}
}
76 changes: 37 additions & 39 deletions web-app/src/Components/SecondSec/SecondSec.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
gap: 50px;
justify-content: center;
align-items: center;
margin: auto 50px;
padding: 50px;
}

.secondContain {
Expand All @@ -13,8 +13,9 @@
}

.Mimg {
width: 600px;
height: 450px;
height: 50vh;
margin-left: 0;
margin-top: 0;
}
.secondP {
color: #252b42;
Expand Down Expand Up @@ -48,12 +49,12 @@
.marketP3 {
color: var(--second-text, #737373);
font-family: Montserrat;
font-size: 15px;
font-size: 18px;
font-style: normal;
font-weight: 500;
line-height: 30px;
letter-spacing: 0.2px;
width: 96%;
letter-spacing: 0.1px;
width: 100%;
}

.marketContainers {
Expand All @@ -62,47 +63,44 @@
justify-content: center;
}



@media screen and (max-width: 1140px) {
@media screen and (max-width: 768px) {
.secondContain {
border: 5px solid red;
display: flex;
flex-direction: column;
width: 70%;
margin: auto;
/* grid-template-columns: 2fr; */
/* margin: 5% 10% 5%; */
gap: 25px;

}

.Mimg {
width: 50%;
border-radius: 15px;
/* margin-left: 18% */
border: 5px solid red;

}

.marketContainers {
color: black;
font-size: 23px;
font-size: 5px;
width: 50%;
border-radius: 15px;
height: auto;
margin-left: 0;
margin-top: 0;
}

.marketContainers .marketP3 {
.marketContainers {
color: black;
font-size: 15px;
border: 5px solid red;

}


font-size: 23px;
font-size: 5px;
}

.marketP2{
font-size: 23px;
}

/* .about .left p {
color: black;
font-size: 20px;
margin: 1rem 0;
} */
.marketP3{
font-family: Montserrat;
font-size: 15px;
font-style: normal;
font-weight: 400;
line-height: 20px;
letter-spacing: 0.1px;
width: 100%;
color: black;
}

.marketContainers {
color: black;
font-size: 12px;

}
}
28 changes: 18 additions & 10 deletions web-app/src/Components/SixthSec/SixthSec.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
display: flex;
flex-direction: column;
align-items: center;
gap: 50px;
width: 100vw;
padding: 50px;
}
.secondContainer {
display: flex;
width: 100%;
gap: 200px;
gap: 50px;
}

.sixP {
Expand All @@ -28,20 +28,22 @@
}

.secondContainer img {
width: 400px;
height: 400px;
width: 50vw;
height: 60vh;
margin: 0;
}

.login-inputs {
display: flex;
width: 100%;
width: 40vw;
gap: 10px;
border-radius: 5px;
border-radius: 10px;
flex-direction: column;
max-width: 500px;
margin: 0 auto;
padding: 20px;
background-color: #ffffff;
justify-content: center;
}

.login-inputs h5 {
Expand All @@ -57,10 +59,10 @@

.login-inputs input,
.login-inputs textarea {
width: 100%;
width: 90%;
padding: 12px;
border: 2px solid #757575;
border-radius: 4px;
border-radius: 10px;
box-sizing: border-box;
}

Expand All @@ -69,7 +71,7 @@
height: 100px;
padding: 12px;
border: 2px solid #757575;
border-radius: 4px;
border-radius: 10px;
box-sizing: border-box;
}

Expand All @@ -78,10 +80,16 @@
color: white;
padding: 12px 20px;
border: none;
border-radius: 4px;
border-radius: 10px;
cursor: pointer;
}

.login-inputs input[type="submit"]:hover {
background-color: #45a049;
}

@media screen and (max-width: 768px){
.secondContainer img{
width: 50%;
}
}
2 changes: 1 addition & 1 deletion web-app/src/Components/SixthSec/SixthSec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const SixthSec = () => {
<div className="SixthSection">
<p className="sixP">Want to know <span className="Pcolours">Eathub?</span></p>
<div className="secondContainer">
<img src={Faq} alt="A marketplace" />
<img src={Faq} alt="A marketplace" />
<div className="marketContainer">
<form className="login-inputs">
<input
Expand Down
49 changes: 40 additions & 9 deletions web-app/src/Components/ThirdSec/ThirdSec.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
.ThirdSection {
display: flex;
width: 100%;
margin-top: 50px;
padding-left: 50px;
width: 100vw;
padding: 50px;
gap: 100px;
}
.thirdsec {
display: flex;
flex-direction: column;
gap: 20px;
margin-top: 100px;
margin-top: 50px;
}

.ThirdP1 {
Expand Down Expand Up @@ -37,11 +36,43 @@
font-size: 18px;
font-style: normal;
font-weight: 500;
line-height: 25px;
line-height: 25px;
letter-spacing: 0.2px;
}

.mobimg{
width: 900px;
height: 700px;
.mobimg {
width: 80vw;
height: 80vh;
margin-left: 0;
margin-top: 0;
}


@media screen and (max-width: 768px){
.ThirdP2{
font-size: 20px;
}
.ThirdP3{
font-family: Montserrat;
font-size: 15px;
font-style: normal;
font-weight: 400;
line-height: 20px;
letter-spacing: 0.1px;
width: 100%;
color: black;
}

.mobimg{
width: 50%;
border-radius: 15px;
height: auto;
margin-left: 0;
margin-top: 0;
}

.ThirdSection{
gap: 25px;

}
}
6 changes: 3 additions & 3 deletions web-app/src/Pages/HomePage.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* body{
width: 100%;
} */
.homepage{
width: 100vw;
}
Loading