Skip to content

Commit 4a556b7

Browse files
ryanmao725ryanmao725
committed
Merge branch 'S2020' of https://github.com/HackRU/frontend into S2020
2 parents 9676b91 + 9f47546 commit 4a556b7

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

‎src/components/Landing/Sections/Home.jsx‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,73 +34,73 @@ class Home extends Component {
3434
<img
3535
alt="background"
3636
src={"./assets/background/target_green.svg"}
37-
height={window.innerHeight / 2} />
37+
height={window.innerHeight / 2} />
3838
</div>
3939
<div style={{ opacity, position: "absolute", bottom: -(window.innerHeight / 3) - movement, left: -100, userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
4040
<img
4141
alt="background"
4242
src={"./assets/background/target_yellow.svg"}
43-
height={window.innerHeight / 2} />
43+
height={window.innerHeight / 2} />
4444
</div>
4545
<div style={{ opacity, position: "absolute", top: (window.innerHeight / 2) - (window.innerHeight / 8), right: movement, userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
4646
<img
4747
alt="background"
4848
src={"./assets/background/shape_white.svg"}
49-
height={window.innerHeight / 4} />
49+
height={window.innerHeight / 4} />
5050
</div>
5151
<div style={{ opacity, position: "absolute", top: (window.innerHeight / 8) + (movement / 2), right: -100 - movement, userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
5252
<img
5353
alt="background"
5454
src={"./assets/background/cross_yellow.svg"}
55-
height={window.innerHeight / 3} />
55+
height={window.innerHeight / 3} />
5656
</div>
5757
<div style={{ opacity, position: "absolute", bottom: (window.innerHeight / 8) + movement, left: window.innerWidth / 4, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
5858
<img
5959
alt="background"
6060
src={"./assets/background/cross_white.svg"}
61-
height={window.innerHeight / 10} />
61+
height={window.innerHeight / 10} />
6262
</div>
6363
<div style={{ opacity, position: "absolute", bottom: -(window.innerHeight / 5), right: window.innerWidth / 7 - movement, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(" + movement + "deg)" }}>
6464
<img
6565
alt="background"
6666
src={"./assets/background/circle-dotted_yellow.svg"}
67-
height={window.innerHeight / 3} />
67+
height={window.innerHeight / 3} />
6868
</div>
6969
<div style={{ opacity, position: "absolute", top: -(window.innerHeight / 5) - movement, right: window.innerWidth / 7, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
7070
<img
7171
alt="background"
7272
src={"./assets/background/circle_green.svg"}
73-
height={window.innerHeight / 3} />
73+
height={window.innerHeight / 3} />
7474
</div>
7575
<div style={{ opacity, position: "absolute", top: -(window.innerHeight / 4), right: window.innerWidth / 3 + movement, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
7676
<img
7777
alt="background"
7878
src={"./assets/background/circle-dotted_white.svg"}
79-
height={window.innerHeight / 2} />
79+
height={window.innerHeight / 2} />
8080
</div>
8181
<div style={{ opacity, position: "absolute", top: (window.innerHeight / 20) + movement, left: window.innerWidth / 10 + movement, userSelect: "none", pointerEvents: "none", zIndex: 10, transform: "rotate(30deg)" }}>
8282
<img
8383
alt="background"
8484
src={"./assets/background/target_yellow.svg"}
85-
height={window.innerHeight / 3} />
85+
height={window.innerHeight / 3} />
8686
</div>
8787
<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)" }}>
8888
<img
8989
alt="background"
9090
src={"./assets/background/target_white.svg"}
91-
height={window.innerHeight / 3} />
91+
height={window.innerHeight / 3} />
9292
</div>
9393
<div style={{ opacity, position: "absolute", bottom: (window.innerHeight / 4), left: window.innerWidth / 7 - (movement / 10), userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
9494
<img
9595
alt="background"
9696
src={"./assets/background/cross_green.svg"}
97-
height={window.innerHeight / 10} />
97+
height={window.innerHeight / 10} />
9898
</div>
9999
<div style={{ opacity, position: "absolute", bottom: (window.innerHeight / 5) - movement, left: -(window.innerHeight / 6), userSelect: "none", pointerEvents: "none", zIndex: 10 }}>
100100
<img
101101
alt="background"
102102
src={"./assets/background/square-dotted_white.svg"}
103-
height={window.innerHeight / 3} />
103+
height={window.innerHeight / 3} />
104104
</div>
105105
</div></div>
106106
}
@@ -176,9 +176,10 @@ class Home extends Component {
176176
}
177177
</Motion>
178178
</Col>
179-
<div style={{ position: "absolute", bottom: 10, left: 10, right: 10, margin: "0 auto"}}>
180-
{ defaults.volunteers.display && <div>
181-
Want to help? Sign up to <a href={defaults.volunteers.vol_url}>volunteer</a> or <a href={defaults.volunteers.mentor_url}>mentor</a>!
179+
<div style={{ position: "absolute", bottom: 10, left: 10, right: 10, margin: "0 auto" }}>
180+
{defaults.volunteers.display &&
181+
<div>
182+
Want to help? Sign up to <a href={defaults.volunteers.vol_url}>volunteer</a> or <a href={defaults.volunteers.mentor_url}>mentor</a>!
182183
</div>
183184
}
184185
<Button href="#about"
@@ -269,8 +270,8 @@ class Home extends Component {
269270
}
270271
</Motion>
271272
{/* {navContainer} */}
272-
{ defaults.volunteers.display && <div>
273-
Want to help? Sign up to <a href={defaults.volunteers.vol_url}>volunteer</a> or <a href={defaults.volunteers.mentor_url}>mentor</a>!
273+
{defaults.volunteers.display && <div>
274+
Want to help? Sign up to <a href={defaults.volunteers.vol_url}>volunteer</a> or <a href={defaults.volunteers.mentor_url}>mentor</a>!
274275
</div>}
275276
</Col>
276277
</Row>

0 commit comments

Comments
 (0)