Skip to content

Commit

Permalink
Merge branch 'S2020' of https://github.com/HackRU/frontend into S2020
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanmao725
ryanmao725 committed Feb 17, 2020
2 parents 9676b91 + 9f47546 commit 4a556b7
Showing 1 changed file with 18 additions and 17 deletions.
35 changes: 18 additions & 17 deletions src/components/Landing/Sections/Home.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,73 +34,73 @@ class Home extends Component {
<img
alt="background"
src={"./assets/background/target_green.svg"}
height={window.innerHeight / 2} />
height={window.innerHeight / 2} />
</div>
<div style={{ opacity, position: "absolute", bottom: -(window.innerHeight / 3) - movement, left: -100, userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
<img
alt="background"
src={"./assets/background/target_yellow.svg"}
height={window.innerHeight / 2} />
height={window.innerHeight / 2} />
</div>
<div style={{ opacity, position: "absolute", top: (window.innerHeight / 2) - (window.innerHeight / 8), right: movement, userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
<img
alt="background"
src={"./assets/background/shape_white.svg"}
height={window.innerHeight / 4} />
height={window.innerHeight / 4} />
</div>
<div style={{ opacity, position: "absolute", top: (window.innerHeight / 8) + (movement / 2), right: -100 - movement, userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
<img
alt="background"
src={"./assets/background/cross_yellow.svg"}
height={window.innerHeight / 3} />
height={window.innerHeight / 3} />
</div>
<div style={{ opacity, position: "absolute", bottom: (window.innerHeight / 8) + movement, left: window.innerWidth / 4, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
<img
alt="background"
src={"./assets/background/cross_white.svg"}
height={window.innerHeight / 10} />
height={window.innerHeight / 10} />
</div>
<div style={{ opacity, position: "absolute", bottom: -(window.innerHeight / 5), right: window.innerWidth / 7 - movement, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(" + movement + "deg)" }}>
<img
alt="background"
src={"./assets/background/circle-dotted_yellow.svg"}
height={window.innerHeight / 3} />
height={window.innerHeight / 3} />
</div>
<div style={{ opacity, position: "absolute", top: -(window.innerHeight / 5) - movement, right: window.innerWidth / 7, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
<img
alt="background"
src={"./assets/background/circle_green.svg"}
height={window.innerHeight / 3} />
height={window.innerHeight / 3} />
</div>
<div style={{ opacity, position: "absolute", top: -(window.innerHeight / 4), right: window.innerWidth / 3 + movement, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
<img
alt="background"
src={"./assets/background/circle-dotted_white.svg"}
height={window.innerHeight / 2} />
height={window.innerHeight / 2} />
</div>
<div style={{ opacity, position: "absolute", top: (window.innerHeight / 20) + movement, left: window.innerWidth / 10 + movement, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
<img
alt="background"
src={"./assets/background/target_yellow.svg"}
height={window.innerHeight / 3} />
height={window.innerHeight / 3} />
</div>
<div style={{ opacity, position: "absolute", top: (window.innerHeight / 2) - (window.innerHeight / 6), left: -(window.innerHeight / 6), userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
<img
alt="background"
src={"./assets/background/target_white.svg"}
height={window.innerHeight / 3} />
height={window.innerHeight / 3} />
</div>
<div style={{ opacity, position: "absolute", bottom: (window.innerHeight / 4), left: window.innerWidth / 7 - (movement / 10), userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
<img
alt="background"
src={"./assets/background/cross_green.svg"}
height={window.innerHeight / 10} />
height={window.innerHeight / 10} />
</div>
<div style={{ opacity, position: "absolute", bottom: (window.innerHeight / 5) - movement, left: -(window.innerHeight / 6), userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
<img
alt="background"
src={"./assets/background/square-dotted_white.svg"}
height={window.innerHeight / 3} />
height={window.innerHeight / 3} />
</div>
</div></div>
}
Expand Down Expand Up @@ -176,9 +176,10 @@ class Home extends Component {
}
</Motion>
</Col>
<div style={{ position: "absolute", bottom: 10, left: 10, right: 10, margin: "0 auto"}}>
{ defaults.volunteers.display && <div>
Want to help? Sign up to <a href={defaults.volunteers.vol_url}>volunteer</a> or <a href={defaults.volunteers.mentor_url}>mentor</a>!
<div style={{ position: "absolute", bottom: 10, left: 10, right: 10, margin: "0 auto" }}>
{defaults.volunteers.display &&
<div>
Want to help? Sign up to <a href={defaults.volunteers.vol_url}>volunteer</a> or <a href={defaults.volunteers.mentor_url}>mentor</a>!
</div>
}
<Button href="#about"
Expand Down Expand Up @@ -269,8 +270,8 @@ class Home extends Component {
}
</Motion>
{/* {navContainer} */}
{ defaults.volunteers.display && <div>
Want to help? Sign up to <a href={defaults.volunteers.vol_url}>volunteer</a> or <a href={defaults.volunteers.mentor_url}>mentor</a>!
{defaults.volunteers.display && <div>
Want to help? Sign up to <a href={defaults.volunteers.vol_url}>volunteer</a> or <a href={defaults.volunteers.mentor_url}>mentor</a>!
</div>}
</Col>
</Row>
Expand Down

0 comments on commit 4a556b7

Please sign in to comment.