Skip to content

Commit

Permalink
Merge pull request #102 from MicrosoftStudentChapter/aboutus2
Browse files Browse the repository at this point in the history
About Us Image Changed
  • Loading branch information
nimishmedatwal authored Jul 13, 2023
2 parents 59cd336 + 532b3df commit 1093462
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 19 deletions.
4 changes: 2 additions & 2 deletions src/Pages/AboutUs2/About2.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import Style from "../AboutUs2/Styles/about.module.css";
import main from "./Assets/main.png";
import main2 from "./Assets/main(2).png";
import Arrow from "./Assets/arrow.png";
import Block from "./Assets/block.png";
import Plus from "./Assets/plus.png";
Expand All @@ -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={main} alt="" className={Style.mainimage} />
<img src={main2} alt="" className={Style.mainimage} />
<div className={Style.container}>
<div className={Style.insideimage}>
<div className={Style.text}>
Expand Down
Binary file added src/Pages/AboutUs2/Assets/main(2).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 36 additions & 17 deletions src/Pages/AboutUs2/Styles/about.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
.mainimage {
/* width: 40%; */
margin: -1% 2% 0 4%;
flex: 1.2;
opacity: 60%;
flex: 1;
}
.container {
display: flex;
Expand Down Expand Up @@ -100,14 +101,19 @@

@media screen and (max-width:1440px) {

.heading{
font-size: 350%;
margin-top: 2%;
}

.insideimage{
width: 33vw;
height: 38vh;
width: 39vw;
height: 37vh;
}

.container{
width: 33vw;
height: 42vh;
width: 41vw;
height: 41vh;
}

.text{
Expand All @@ -123,8 +129,8 @@
}

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

.text{
Expand All @@ -135,8 +141,8 @@
}

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

.mainimage {
Expand All @@ -146,9 +152,13 @@
}

@media screen and (max-width:800px){

.heading{
margin-top: 5%;
}
.insideimage{
width: 38vw;
height: 58vh;
height: 51vh;
}

.text{
Expand All @@ -160,7 +170,7 @@

.container{
width: 31vw;
height: 60vh;
height: 52vh;
}
.rectangle{
width: 85vw;
Expand All @@ -169,7 +179,7 @@
.block1{
position: absolute;
left: 73%;
bottom: 80%;
bottom: 85%;
}
}

Expand All @@ -179,7 +189,7 @@
text-align: center;
margin-left: 35%;
font-size: 140%;
margin-top: 1%;
margin-top: 8%;
}

.block1{
Expand All @@ -199,7 +209,7 @@

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

.text{
Expand All @@ -220,7 +230,7 @@
.arrow{
width: 16vw;
position: absolute;
top: 13%;
top: 10%;
}

.block{
Expand All @@ -236,10 +246,15 @@
}

@media screen and (max-width:400px){

.heading{
margin-top: 2%;
}

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

Expand Down Expand Up @@ -278,7 +293,7 @@
.container{
bottom: 50%;
width: 80vw;
height: 31vh;
height: 33vh;
left: 1%;
}

Expand All @@ -301,6 +316,10 @@
.elements {
top: 90%;
}

.arrow{
top: 9%;
}
}


0 comments on commit 1093462

Please sign in to comment.