Skip to content
This repository was archived by the owner on Jun 10, 2019. It is now read-only.

Commit d6c6f1a

Browse files
authored
Merge branch 'master' into issue#135
2 parents d5d23bf + 6c3e38c commit d6c6f1a

15 files changed

Lines changed: 173 additions & 106 deletions

File tree

src/images/Family-2.jpg

428 KB
Loading

src/images/Family-2.png

3.57 MB
Loading

src/images/Family-mobile.jpg

334 KB
Loading

src/images/icons/newburger.png

4.6 KB
Loading

src/scenes/home/404/404.gif

941 KB
Loading

src/scenes/home/404/fourOhFour.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
.FourOhFour {
2+
width: 100vw;
3+
height: 100vh;
4+
background: #121212;
5+
}
6+
7+
.FourOhFour .bg {
8+
background-image: url('./404.gif');
9+
width: 100vw;
10+
height: 100vh;
11+
background-size: cover;
12+
color: white;
13+
display:flex;
14+
flex-direction: column;
15+
justify-content: center;
16+
align-items: center;
17+
}
18+
19+
.title{
20+
font-size: 4rem;
21+
}
22+
23+
.paragraph {
24+
font-size: 1.4rem;
25+
}
26+

src/scenes/home/404/fourOhFour.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import React, { Component } from 'react';
2+
import styles from './fourOhFour.css';
3+
4+
export default class FourOhFour extends Component {
5+
6+
render() {
7+
return (
8+
<div className={styles.FourOhFour}>
9+
<div className={styles.bg}>
10+
<h1 className={styles.title}>404!</h1>
11+
<p className={styles.paragraph}>You definitely weren&apos;t supposed to see this...</p>
12+
</div>
13+
</div>
14+
);
15+
}
16+
}
17+

src/scenes/home/header/burger/burger.css

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
}
44

55
.burger img {
6-
width: 40px;
6+
width: 2.5em;
77
margin: 0;
8+
background-color: #fafafa;
9+
padding: 10px;
10+
border-radius: 5px;
11+
transition: box-shadow 0.2s cubic-bezier(0.4, 0, 0.2, 1);
12+
transition-delay: 0.2s;
13+
box-shadow: 0 2px 5px 0 grey;
814
}
915

1016
@media screen and (max-width: 760px) {
1117
.burger {
1218
display: block;
1319
position: absolute;
14-
right: 0;
15-
margin: 0;
16-
margin-right: 7px;
17-
padding: 0 4px 0 4px;
20+
right: 5%;
21+
top: 15px;
1822
}
1923
}
Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
.content {
2-
padding: 16px;
2+
background-color: black;
3+
background-color:rgba(47,52,72,.95);
4+
height: 100%;
5+
width: 100%;
6+
position: fixed;
37
}
48

59
.header {
@@ -9,33 +13,38 @@
913

1014
.close {
1115
color: #fff;
12-
font-size: 26px;
13-
padding: 6px; /*to increase clickability on mobile*/
1416
text-decoration: none;
17+
font-size: 40px;
18+
position: absolute;
19+
right: 5%;
20+
top: 22px;
21+
padding-right: 10px;
22+
line-height: 1;
1523
}
1624

1725
.logoWrapper {
1826
text-align: center;
1927
}
2028

2129
.logo {
22-
margin: 16px auto;
2330
max-width: 75%;
2431
max-height: 40px;
25-
width: auto;
26-
height: auto;
32+
position: absolute;
33+
top: 20px;
34+
left: 5%;
2735
}
2836

2937
.list {
3038
display: flex;
3139
flex-direction: column;
32-
margin-top: 8px;
33-
padding: 16px;
40+
margin-top: 80px;
41+
padding: 50px 5%;
42+
border-top: 1px solid #fafafa;
43+
font-size: 40px;
3444
}
3545

3646
.item {
3747
color: #F7F7F7;
38-
font-size: 60px;
3948
}
4049

4150
.item ~ .item {
@@ -46,7 +55,8 @@
4655
display: flex;
4756
height: 100%;
4857
flex-direction: column;
49-
padding-top: 1rem;
58+
padding-top: 1.75rem;
59+
position: relative;
5060
}
5161

5262
.navButton {
@@ -56,5 +66,5 @@
5666
text-align: left;
5767
font-size: 2.5rem;
5868
margin: 0.5rem 0;
59-
padding: 0;
69+
padding: 0;
6070
}

src/scenes/home/home.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
.backgroundImage {
1818
background-size: 100%;
19+
background-position: center top;
1920
background-repeat: no-repeat;
2021
}
2122

0 commit comments

Comments
 (0)