Skip to content

Commit 41ac1a2

Browse files
authored
Merge pull request #33 from Blakeinstein/master
2 parents 359e01a + 212b964 commit 41ac1a2

File tree

5 files changed

+23
-24
lines changed

5 files changed

+23
-24
lines changed

gatsby-browser.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
/**
2-
* Implement Gatsby's Browser APIs in this file.
3-
*
4-
* See: https://www.gatsbyjs.com/docs/browser-apis/
5-
*/
6-
71
import "./src/css/global.css";
82
import React from "react";
93
import Layout from "./src/components/layout";
104

115
require('typeface-rubik');
126

13-
// Wraps every page in a component
147
export const wrapPageElement = ({ element, props }) => {
158
return <Layout {...props}>{element}</Layout>
169
}

gatsby-ssr.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
/**
2-
* Implement Gatsby's SSR (Server Side Rendering) APIs in this file.
3-
*
4-
* See: https://www.gatsbyjs.com/docs/ssr-apis/
5-
*/
1+
import React from "react";
2+
import Layout from "./src/components/layout";
63

7-
// You can delete this file if you're not using it
4+
export const wrapPageElement = ({ element, props }) => {
5+
return <Layout {...props}>{element}</Layout>
6+
}

src/components/eventCard.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ function EventCard(props) {
88
const { title, description, attachments, link } = props
99
const startDate = moment(props.startDate)
1010
const endDate = moment(props.endDate)
11-
12-
const imageAttachment = attachments.find(a => a.mimeType.startsWith("image/"))
11+
let imageAttachment = null;
12+
if (attachments)
13+
imageAttachment = attachments.find(a => a.mimeType.startsWith("image/")) || null;
1314
let imageUrl = imageAttachment
1415
? "https://drive.google.com/uc?export=view&id=" + imageAttachment.fileId
1516
: "https://drive.google.com/uc?export=view&id=1FQCwCAFxeagUXASyYQEIFljeQ-dTqiOU"

src/components/layout.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ import "../css/layout.css"
77

88
import Hero from "./hero"
99

10-
const Layout = props => {
11-
const { children, path } = props;
12-
10+
const Layout = ({children, path}) => {
1311
return (
14-
<>
12+
<div id="Page">
1513
<div id="hero">
1614
<Hero/>
1715
</div>
@@ -20,7 +18,7 @@ const Layout = props => {
2018
<div className="content">{children}</div>
2119
<Footer />
2220
</div>
23-
</>
21+
</div>
2422
)
2523
}
2624

src/css/layout.css

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@
2424
}
2525

2626
.wrapper .footer {
27-
flex: 0 0 10px;
27+
flex: 0 0 20px;
28+
padding-bottom: 10px;
2829
color: white;
30+
background: -webkit-linear-gradient(#eee, #333);
31+
background-clip: text;
32+
-webkit-background-clip: text;
33+
-webkit-text-fill-color: transparent;
2934
}
3035

3136
#hero {
@@ -36,7 +41,10 @@
3641
visibility: visible;
3742
}
3843

39-
#hero.hide {
40-
opacity: 0;
41-
transition: opacity 0.1s ease-in;
44+
#Page {
45+
height: 100%;
46+
width: 100%;
47+
top: 0;
48+
left: 0;
49+
position: absolute;
4250
}

0 commit comments

Comments
 (0)