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.

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

Jump to bottom

Photo replaced by Aftermovie #113

Merged
merged 5 commits into from
Sep 10, 2023
Merged

Photo replaced by Aftermovie #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0a4ce8
Aftermovie Added
JayitaL Jul 28, 2023
32e918d
Change after movie link to new one
MankiratSingh1315 Sep 10, 2023
2ff93b2
Merge branch 'main' into aboutus
MankiratSingh1315 Sep 10, 2023
c2830ba
increase line height
MankiratSingh1315 Sep 10, 2023
9e2bc9f
Data updated
MankiratSingh1315 Sep 10, 2023
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 src/Pages/AboutUs2/About2.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function About2() {
<img src={Arrow} alt="" className={Style.arrow} />
<img src={Block} className={Style.block1} />
<div className={Style.parent}>
<img src="https://res.cloudinary.com/disstxt8t/image/upload/v1689614151/main_2_xugcq5.png" alt="" className={Style.mainimage} />
<iframe src="https://www.youtube.com/embed/Iwl-0ja8hqQ?si=l5TLotLk6dnRjn9-?autoplay=1" className={Style.mainimage}></iframe>
<div className={Style.container}>
<div className={Style.insideimage}>
<div className={Style.text}>
Expand Down
47 changes: 26 additions & 21 deletions src/Pages/AboutUs2/Styles/about.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
color: beige;
text-align: center;
margin: 0 auto;
margin-top: 6%;
margin-top: 1.5%;
font-size: 230%;
border-bottom: 4px solid rgba(250, 57, 102, 0.73);
width: fit-content;
Expand Down Expand Up @@ -41,7 +41,7 @@
font-style: normal;
font-weight: 400;
font-size: 107%;
line-height: 150%;
line-height: 1.3;
text-align: center;

color: rgba(223, 223, 223, 0.72);
Expand Down Expand Up @@ -79,8 +79,8 @@
}

.insideimage {
width: 39vw;
height: 37vh;
width: 41vw;
height: 35vh;
}

.container {
Expand All @@ -89,9 +89,13 @@
}

.text {
line-height: 140%;
line-height: 110%;
font-size: 120%;
}

.elements {
margin-top: 5%;
}
}

@media screen and (max-width: 1024px) {
Expand All @@ -101,7 +105,7 @@

.insideimage {
width: 46vw;
height: 41vh;
height: 51vh;
}

.text {
Expand All @@ -113,7 +117,7 @@

.container {
width: 46vw;
height: 42vh;
height: 51vh;
}

.mainimage {
Expand All @@ -127,7 +131,7 @@
margin-top: 5%;
}
.insideimage {
width: 38vw;
width: 48vw;
height: 51vh;
}

Expand Down Expand Up @@ -164,35 +168,35 @@
.block1 {
position: absolute;
left: 70%;
bottom: 90%;
bottom: 95%;
width: 25vw;
}

.mainimage {
position: absolute;
top: 52%;
top: 57%;
left: 2%;
width: 90vw;
height: 40vh;
}

.insideimage {
width: 80vw;
height: 25vh;
height: 29vh;
}

.text {
line-height: 100%;
line-height: 90%;
font-size: 87%;
font-weight: 300;
text-align: center;
}

.container {
position: absolute;
bottom: 47%;
bottom: 42%;
width: 80vw;
height: 30vh;
height: 35vh;
margin-left: 10%;
}

Expand Down Expand Up @@ -220,15 +224,15 @@
}

.container {
bottom: 47%;
bottom: 39%;
width: 72vw;
height: 33vh;
height: 39vh;
left: 5%;
}

.insideimage {
width: 70vw;
height: 31vh;
height: 34vh;
}

.block1 {
Expand All @@ -241,7 +245,7 @@
.mainimage {
width: 90vw;
height: 40vh;
top: 55%;
top: 60%;
}
.arrow {
width: 16vw;
Expand All @@ -250,6 +254,7 @@
}
.text {
font-size: smaller;
line-height: 85%;
}
.heading {
position: absolute;
Expand All @@ -259,21 +264,21 @@

@media screen and (max-width: 350px) {
.container {
bottom: 50%;
bottom: 47%;
width: 80vw;
height: 33vh;
left: 1%;
}

.insideimage {
width: 80vw;
height: 31.5vh;
height: 34vh;
}

.mainimage {
width: 90vw;
height: 37vh;
top: 53%;
top: 59%;
}

.heading {
Expand Down
84 changes: 10 additions & 74 deletions src/Pages/OurTeam/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
"key": "3",
"naam": "Daanish Mittal"
},
{
"key": "4",
"naam": "Ishita"
},
{
"key": "5",
"naam": "Jahanvi Srivastava"
Expand All @@ -24,10 +20,6 @@
"key": "6",
"naam": "Jatin Chhabra"
},
{
"key": "7",
"naam": "Abhinandan Wadhwa"
},
{
"key": "8",
"naam": "Mankirat Singh"
Expand Down Expand Up @@ -192,13 +184,7 @@
{
"key": "4",
"naam": "Jayant"
},
{
"key": "5",
"naam": "Malhar"
},


},
{
"key": "6",
"naam": "Sarthak"
Expand All @@ -213,26 +199,13 @@
"naam": "Surya"
},
{
"key": "9",
"naam": "Tanmay Saluja"
},
{
"key": "10",
"naam": "Aabharan Gupta"
},
{
"key": "11",
"naam": "Aamna Abdin"
},
"key": "10",
"naam": "Ananya"
},
{
"key": "12",
"naam": "Abhilasha Tiwari"
},

{
"key": "13",
"naam": "Abhyuday Venkatesh"
},
{
"key": "14",
"naam": "Aditya Sapra"
Expand Down Expand Up @@ -270,11 +243,6 @@
"key": "22",
"naam": "Anuvind"
},
{
"key": "23",
"naam": "Archita Shankar"
},

{
"key": "24",
"naam": "Arnav Gupta"
Expand All @@ -295,10 +263,6 @@
"key": "28",
"naam": "Ayushi"
},
{
"key": "29",
"naam": "D J"
},
{
"key": "30",
"naam": "Debatiya Barman"
Expand All @@ -307,8 +271,6 @@
"key": "31",
"naam": "Dev Mehta"
},


{
"key": "32",
"naam": "Himanshu Jhawar"
Expand All @@ -326,18 +288,10 @@
"key": "35",
"naam": "Jayita"
},
{
"key":"35.5",
"naam":"Garvit Gulati"
},
{
"key": "36",
"naam": "Kavya"
},
{
"key": "37",
"naam": "Khushi"
},
{
"key": "38",
"naam": "Khushpreet Singh"
Expand All @@ -359,11 +313,6 @@
"key": "42",
"naam": "Manan"
},

{
"key": "43",
"naam": "Neha"
},
{
"key": "44",
"naam": "Dev Goyal"
Expand All @@ -389,10 +338,6 @@
"key": "49",
"naam": "Punya Garg"
},
{
"key": "50",
"naam": "Raghav"
},
{
"key": "51",
"naam": "Raghav Jindal"
Expand All @@ -405,11 +350,6 @@
"key": "53",
"naam": "Rajat"
},

{
"key": "54",
"naam": "Rijul"
},
{
"key": "55",
"naam": "Riya"
Expand Down Expand Up @@ -449,10 +389,6 @@
"key": "63",
"naam": "Sarthak Kala"
},
{
"key": "64",
"naam": "Shreya Gakhar"
},
{
"key": "65",
"naam": "Sure?Ya"
Expand Down Expand Up @@ -491,7 +427,7 @@

{
"key": "73",
"naam": "Ananya JIndal"
"naam": "Ananya Jindal"
},


Expand All @@ -503,10 +439,6 @@
"key": "75",
"naam": "Arya Lal"
},
{
"key": "76",
"naam": "Smriti Singh"
},
{
"key": "77",
"naam": "Udita Srivastav"
Expand All @@ -518,7 +450,11 @@
{
"key": "79",
"naam": "Suhani Mathur"
}
},
{
"key": "81",
"naam": "Ishita"
}

]}

Loading
Loading