Skip to content

Commit

Permalink
[#49] Style up Coming Soon page with new UX as per issue #48 and prep…
Browse files Browse the repository at this point in the history
… for launch
  • Loading branch information
krissy committed May 14, 2017
1 parent bc6c235 commit 9f63cc7
Show file tree
Hide file tree
Showing 12 changed files with 131 additions and 34 deletions.
15 changes: 7 additions & 8 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
# You can create any custom variable you would like, and they will be accessible
# in the templates via {{ site.myvariable }}.
title: Your awesome title
email: your-email@domain.com
title: Draw My Life - A Perception of Migration Through Anonymised Children's Drawings & Data
email: drawmylife@empowerhack.com
description: > # this means to ignore newlines until "baseurl:"
Write an awesome description for your new site here. You can edit this
line in _config.yml. It will appear in your document head meta (for
Google search results) and in your feed.xml site description.
Draw My Life is inspired by how children's art therapy in the field
can become a basis for better data around the needs and experience
of refugee children.
baseurl: "" # the subpath of your site, e.g. /blog
url: "" # the base hostname & protocol for your site, e.g. http://example.com
twitter_username: jekyllrb
github_username: jekyll
url: "https://drawmylife.org"
twitter_username: drawmylifeteam

# Build settings
markdown: kramdown
Expand Down
7 changes: 6 additions & 1 deletion src/_sass/_helpers/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:400,700');
@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:100,400,700');

// **** Fonts **** //
$font-family: 'Josefin Sans', sans-serif;

// **** Colours **** //
$white: white;

$button-fg: #222222;
$button-bg: #fddf50;
$button-fg-hover: #fddf50;
$button-bg-hover: #222222;
28 changes: 19 additions & 9 deletions src/_sass/button.scss
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
.dml-button {
background-color: black;
border-color: black;
background-color: $button-bg;
border-color: $button-bg;
border-radius: 2em;
margin: 1.5em;
margin: 3em 0;
padding: 1em;
text-transform: uppercase;
width: 10em;
width: 15em;
font-weight: bold;
font-size: 16px;

@include breakpoint(small) {
margin: 1.5em 0;
}

> a {
color: yellow;
color: $button-fg;
background-color: $button-bg;

&:hover {
color: $button-fg-hover;
background-color: $button-bg-hover;
text-decoration: none;
}
}

&:hover {
background-color: yellow;
border-color: yellow;
background-color: $button-bg-hover;
border-color: $button-bg-hover;

> a {
color: black;
color: $button-fg-hover;
background-color: $button-bg-hover;
border-color: $button-bg-hover;
}
}
}
85 changes: 78 additions & 7 deletions src/_sass/coming_soon.scss
Original file line number Diff line number Diff line change
@@ -1,22 +1,87 @@
.coming-soon-wrapper {
align-items: center;
background-image: url('../assets/images/coming_soon.png');
background-image: url('../assets/images/coming_soon_large.jpg');
background-position: top center;
background-repeat: no-repeat;
background-size: cover;
display: flex;
font-family: $font-family;
// background-size: 100% auto;
height: 100%;
min-width: 100%;
box-shadow: inset 0px -4px 14px 0px rgba(50, 50, 50, 0.71);
z-index: 0;
position: relative;
display: flex;
flex-direction: row;
justify-content: center;
text-align: center;
padding-bottom: 40px;

@include breakpoint(medium) {
background-image: url('../assets/images/coming_soon_medium.jpg');
}

@include breakpoint(small) {
background-image: url('../assets/images/coming_soon_small.jpg');
}

}

.coming-soon-wrapper:after {
content: '';
background: linear-gradient(135deg, #333, #000);
width: 100%;
height: 100%;
opacity: 0.7;
top: 0;
left: 0;
display: block;
z-index: 1;
position: absolute;
}

.coming-soon-footer {
color: #c0c0c0;
background-color: #333333;
padding: 1em;
}

.coming-soon-content {
height: 100vh;
display: block;
z-index: 2;
justify-content: center;
text-align: center;
height: 100%;
max-width: 65%;
font-family: $font-family;
color: #c0c0c0;

h1 {
font-size: 6em;
font-weight: 100;

@include breakpoint(medium) {
font-size: 4em;
}

@include breakpoint(small) {
font-size: 3em;
}
}

h2 {
font-size: 3em;
font-weight: 100;
margin: 1.5em 0;

@include breakpoint(medium) {
font-size: 2em;
}

@include breakpoint(small) {
font-size: 2em;
}
}

.page-header {
border: 0;
}

p {
Expand All @@ -25,10 +90,11 @@
}

a {
color: #3498db;
color: #c5093b;

&:hover {
text-decoration: none;
color: #ff558f;
}
}

Expand All @@ -42,4 +108,9 @@
text-indent: -9999px;
width: 250px;
}

.eh-logo {
background-color: #fff;
padding: 10px;
}
}
Binary file removed src/assets/images/coming_soon.png
Binary file not shown.
Binary file added src/assets/images/coming_soon_large.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/coming_soon_medium.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/coming_soon_small.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/empowerhack-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 8 additions & 2 deletions webpack/components/ComingSoonLayout.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { comingSoon } from '../copy/coming_soon.js';

export default class ComingSoonLayout extends React.Component {
static get propTypes() {
Expand All @@ -9,8 +10,13 @@ export default class ComingSoonLayout extends React.Component {

render() {
return (
<div className="container-fluid coming-soon-wrapper">
{ this.props.children }
<div>
<div className="container-fluid coming-soon-wrapper">
{ this.props.children }
</div>
<div className="coming-soon-footer">
{ comingSoon.footerLine }
</div>
</div>
);
}
Expand Down
8 changes: 6 additions & 2 deletions webpack/components/pages/ComingSoon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@ export default class ComingSoon extends React.Component {

<div className="dml-logo"></div>

<p>{ comingSoon.tagline }</p>
<h2>{ comingSoon.tagline }</h2>

<div dangerouslySetInnerHTML={ comingSoon.description } />

<DMLButton buttonText={ comingSoon.callToActionText } buttonURL={ comingSoon.callToActionURL } />

<div dangerouslySetInnerHTML={ comingSoon.description } />
<div dangerouslySetInnerHTML={ comingSoon.moreInfo } />

<a href="http://empowerhack.io#drawmylife"><img className="eh-logo" width="100" src="/assets/images/empowerhack-logo.png" /></a>
</div>
);
}
Expand Down
12 changes: 7 additions & 5 deletions webpack/copy/coming_soon.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
export const comingSoon = {
title: 'Coming Soon',
tagline: 'A Perception of Migration Through Anonymised Childrens\' Drawings & Data',
tagline: 'A Perception of Migration Through Anonymised Children\'s Drawings & Data',
callToActionText: 'Contact Us',
callToActionURL: 'mailto:drawmylife@empowerhack.com',
description: {__html: `
<p>How can the humanitarian community strengthen and understand the voice of child refugees?</p>
<p>Draw My Life is inspired by how childrens' art therapy in the field can become a basis for better data around the needs and experience of refugee children.</p>
<p>Read more about us and other projects at <a href="http://empowerhack.io/#drawmylife">EmpowerHack</a>.</p>
`}
<p>Draw My Life is inspired by how children's art therapy in the field can become a basis for better data around the needs and experience of refugee children.</p>
`},
moreInfo: {__html: `
<p>More about Draw My Life and other projects at <a href="http://empowerhack.io/#drawmylife">EmpowerHack</a></p>
`},
footerLine: 'Photo credit: Rachel Unkovic, International Rescue Committee (via Flickr)'
};

0 comments on commit 9f63cc7

Please sign in to comment.