Skip to content

Commit

Permalink
Merge pull request homedepot#130 from homedepot/98-design-updates
Browse files Browse the repository at this point in the history
Design updates
  • Loading branch information
wrmilling authored Oct 21, 2019
2 parents bdada24 + 3f10f7d commit 5dac5f1
Show file tree
Hide file tree
Showing 18 changed files with 37 additions and 68 deletions.
Binary file removed ui/src/assets/fonts/ARLRDBD_0.woff
Binary file not shown.
Binary file added ui/src/assets/fonts/DroidSerif-Bold.ttf
Binary file not shown.
Binary file added ui/src/assets/fonts/Lato-Bold.ttf
Binary file not shown.
Binary file removed ui/src/assets/images/Logo_Galaxy.png
Binary file not shown.
Binary file removed ui/src/assets/images/Logo_Galaxy_Colour.png
Binary file not shown.
Binary file not shown.
Binary file added ui/src/assets/images/MAW_Georgia_white.png
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 ui/src/assets/images/TheSkyisTheLimitLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 0 additions & 32 deletions ui/src/assets/images/logo_galaxy_501x176.svg

This file was deleted.

8 changes: 4 additions & 4 deletions ui/src/header/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react'
import MakeAWishLogo from '../assets/images/Logo_MakeAWish.svg'
import GalaxyLogo from '../assets/images/newStyle/logo_galaxy_501x176.svg'
import MakeAWishLogo from '../assets/images/MAW_Georgia_white.png'
import RocketLogo from '../assets/images/TheSkyisTheLimitLogo.png'
import './styles.scss'

export const Header = () => (
<header>
<section className="slidingVertical header-item" style={{color: '#000000'}}>
<section className="slidingVertical header-item" style={{color: 'white'}}>
<span>Hello!</span>
<span>Bonjour!</span>
<span>Hola!</span>
Expand All @@ -20,7 +20,7 @@ export const Header = () => (
/>
</section>
<section className="header-item">
<img className="header-galaxy-logo" src={GalaxyLogo} alt="Galaxy Logo" />
<img className="header-rocket-logo" src={RocketLogo} alt="Rocket Logo" />
</section>
</header>
)
11 changes: 9 additions & 2 deletions ui/src/header/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
header {
padding-top: 40px;
display: grid;
grid-template-columns: 1fr 1fr 1fr;

Expand All @@ -8,11 +9,17 @@ header {
align-items: center;
}

.header-galaxy-logo {
.header-rocket-logo {
transform: scale(2.0, 2.0);
max-height: 6em;
}

.logo-container, .galaxy-logo-container {
.header-make-a-wish-logo {
transform: scale(2.0,2.0);
max-height: 6em;
}

.logo-container, .rocket-logo-container {
display: flex;
justify-content: space-between;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion ui/src/landing/splashScreen/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const Landing = ({ name, age, updateField, selectWishType, validFields })
return (
<div id="SplashScreen">
<Header />
<div className="wish-input" style={{color: '#000000'}}>
<div className="wish-input">
<span>My name is </span>
<input data-test="name-input" placeholder="enter your name" type="text" onChange={(e) => updateField(nameField, e.target.value)} value={name}/>
<span> and I am </span>
Expand Down
14 changes: 7 additions & 7 deletions ui/src/landing/splashScreen/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
position: absolute;
height: 100%;
width: 100%;
background-color: $light-blue;
color: $dark-blue;
font-family: 'Arial Rounded MT Bold', sans-serif;
padding: 2.5em;
background-image: url('../../assets/images/MAW_StarrySpace_Background.svg');
color: $white;
font-family: 'Lato', sans-serif;
box-sizing: border-box;

.fields-not-valid {
Expand All @@ -18,6 +17,7 @@

h1 {
font-size: 3.5em;
color: $white;
}

.header-title {
Expand All @@ -30,10 +30,10 @@
}

@font-face {
font-family: 'Arial Rounded MT Bold';
font-family: 'Lato';
font-style: normal;
font-weight: normal;
src: local('Arial Rounded MT Bold'), url('../../assets/fonts/ARLRDBD_0.woff') format('woff');
src: local('Lato'), url('../../assets/fonts/Lato-Bold.ttf') format('ttf');
}

img.header-galaxy-logo {
Expand All @@ -54,7 +54,7 @@
}

input::placeholder {
color: $rose;
color: $light-blue;
font-weight: bold;
}

Expand Down
3 changes: 1 addition & 2 deletions ui/src/landing/wishTypeCard/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react'
import './styles.scss'

export const WishTypeCard = ({imgSrc, altText, title, subtitle}) => (
export const WishTypeCard = ({imgSrc, altText, title}) => (
<div className="wishCard containerVertical">
<img src={imgSrc} alt={altText} className="wish-card-image"/>
<span className="card-title">{title}</span>
<span className="card-subtitle">{subtitle}</span>
</div>
)
12 changes: 7 additions & 5 deletions ui/src/landing/wishTypeCard/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,17 @@
flex-direction: column;
align-items: center;
transition: all .2s ease-in-out;
font-family: 'Droid Sans Bold', serif;

&:hover {
cursor: pointer;
transform: scale(1.05);

span {
color: #fdec6e;
text-shadow:0px 0px 30px #fdec6e;
transition: all 0.2s ease-in;
}
}

.wish-card-image {
Expand All @@ -21,9 +28,4 @@
margin: .25em 0;
font-weight: bold;
}

.card-subtitle {
font-weight: bold;
font-size: 1.8em;
}
}
18 changes: 7 additions & 11 deletions ui/src/landing/wishTypeList/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,34 @@ export const WishTypeList = ({ selectWishType, validFields, age, name }) => {
if (validAge && validName) {
return (
<Fragment>
<h1 style={styles.text}>I wish to:</h1>
<ul id="WishTypeList" className="wish-type-select" style={styles.text}>
<li data-test="wishcard-rocket" style={styles.text} onClick={() => selectWishType(GO)}>
<h1>I wish to:</h1>
<ul id="WishTypeList" className="wish-type-select">
<li data-test="wishcard-rocket" onClick={() => selectWishType(GO)}>
<WishTypeCard
altText="Rocket"
imgSrc={Rocket}
title={GO}
subtitle="Somewhere!"
title={`To Go`}
/>
</li>
<li data-test="wishcard-alien" onClick={() => selectWishType(MEET)}>
<WishTypeCard
altText="Alien"
imgSrc={Alien}
title={MEET}
subtitle="Someone!"
title={`To Meet`}
/>
</li>
<li data-test="wishcard-astronaut" onClick={() => selectWishType(BE)}>
<WishTypeCard
altText="Astronaut"
imgSrc={Astronaut}
title={BE}
subtitle="Someone!"
title={`To Be`}
/>
</li>
<li data-test="wishcard-telescope" onClick={() => selectWishType(HAVE)}>
<WishTypeCard
altText="Telescope"
imgSrc={Telescope}
title={HAVE}
subtitle="Something!"
title={`To Have`}
/>
</li>
</ul>
Expand Down
3 changes: 1 addition & 2 deletions ui/src/login/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
display: grid;
width: 100vw;
height: 100vh;
background-color: $light-blue;
background-image: url('../assets/images/MAW_StarrySpace_Background.svg');
color: $dark-blue;
padding: 1.5em;
box-sizing: border-box;
grid-template-rows: 20% auto;

Expand Down
2 changes: 0 additions & 2 deletions ui/src/wishList/wishHeader/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import React from 'react'
import makeAWishLogo from '../../assets/images/Logo_MakeWish.png'
import galaxyLogo from '../../assets/images/Logo_Galaxy.png'
import './styles.scss'

const WishHeader = () => (
<div id="wishHeader">
<div className="logo-container">
<img src={makeAWishLogo} className="makeAWishLogo" alt="make a wish logo" />
<img src={galaxyLogo} className="galaxyLogo" alt="galaxy logo" />
</div>
<div className="user-details">
<span>Mary</span> |
Expand Down

0 comments on commit 5dac5f1

Please sign in to comment.