Skip to content
This repository was archived by the owner on Apr 24, 2022. It is now read-only.

Commit

Permalink
🔀 Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Pustur committed Apr 2, 2020
2 parents f64cdd3 + 89d756f commit 5c20f95
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 17 deletions.
43 changes: 31 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tlou2-countdown",
"description": "A website that shows a countdown to the release of The Last of Us Part II",
"version": "1.0.1",
"version": "1.0.2",
"author": {
"name": "Loris Bettazza",
"email": "loris.bettazza@gmail.com"
Expand Down
5 changes: 5 additions & 0 deletions src/components/Layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ svg {
display: block;
}

a {
color: #2aa3ef;
text-decoration: none;
}

/* COMPONENTS */
.Title {
margin: 0;
Expand Down
16 changes: 12 additions & 4 deletions src/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
import React from 'react';
import Helmet from 'react-helmet';
import Layout from '../components/Layout';
import Countdown from '../components/Countdown';
import CountdownDisplay from '../components/CountdownDisplay';

const IndexPage = () => (
<Layout>
{({ isClient }) => (
<>
<div className="Wrapper">
<main className="Main">
<Countdown toDate={new Date(2020, 4, 29)}>
<header>
<h1 className="Title">The Last of Us Part&nbsp;II</h1>
<p className="Subtitle">
Doesn't have a release date anymore —{' '}
<a href="https://twitter.com/Naughty_Dog/status/1245773177944281089">
Twitter announcement
</a>
</p>
{isClient && <Helmet htmlAttributes={{ class: 'is-counting' }} />}
</header>
{/* <Countdown toDate={new Date(2020, 4, 29)}>
{countdown => (
<>
<header>
Expand Down Expand Up @@ -46,7 +54,7 @@ const IndexPage = () => (
)}
</>
)}
</Countdown>
</Countdown> */}
</main>
</div>
<footer>
Expand Down

0 comments on commit 5c20f95

Please sign in to comment.