diff --git a/client/components/Footer.jsx b/client/components/Footer.jsx index 5601895b5..6d9279b47 100644 --- a/client/components/Footer.jsx +++ b/client/components/Footer.jsx @@ -1,12 +1,13 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'proptypes'; -import { Container, Typography } from '@material-ui/core'; +import Typography from '@material-ui/core/Typography'; import { makeStyles } from '@material-ui/core/styles'; import moment from 'moment'; import { Link } from 'react-router-dom'; import SocialMediaLinks from './SocialMediaLinks'; +// Footer should make use of style overrides to look the same regardless of light/dark theme. const useStyles = makeStyles(theme => ({ footer: { position: 'fixed', @@ -16,14 +17,16 @@ const useStyles = makeStyles(theme => ({ backgroundColor: theme.palette.primary.dark, zIndex: 1, }, + footerSpacing: { + height: theme.footer.height, + }, lastUpdated: { + fontWeight: theme.typography.fontWeightMedium, color: theme.palette.text.dark, lineHeight: theme.footer.height, - fontSize: '14px', - fontFamily: 'Roboto', }, copyright: { - fontSize: '14px', + fontWeight: theme.typography.fontWeightMedium, lineHeight: theme.footer.height, color: theme.palette.text.dark, }, @@ -31,6 +34,7 @@ const useStyles = makeStyles(theme => ({ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', + margin: theme.spacing(0, 2, 0), }, copyrightContainer: { display: 'flex', @@ -46,26 +50,33 @@ const useStyles = makeStyles(theme => ({ // TODO: check with UI/UX re placement of social media, privacy policy links const Footer = ({ lastUpdated }) => { const classes = useStyles(); + const currentDate = new Date(); return ( ); diff --git a/client/components/Header.jsx b/client/components/Header.jsx index 743f8c059..9dbad0dcc 100644 --- a/client/components/Header.jsx +++ b/client/components/Header.jsx @@ -9,7 +9,9 @@ import { Menu, MenuItem, } from '@material-ui/core'; +import fonts from '@theme/fonts'; +// Header should make use of style overrides to look the same regardless of light/dark theme. const useStyles = makeStyles(theme => ({ appBar: { height: theme.header.height, @@ -20,19 +22,20 @@ const useStyles = makeStyles(theme => ({ textDecoration: 'none', }, button: { + color: 'white', textTransform: 'none', - fontFamily: 'Roboto', + fontFamily: fonts.family.roboto, marginLeft: theme.spacing(1), marginRight: theme.spacing(1), - color: 'white', textDecoration: 'none', }, title: { - ...theme.typography.h1, - flexGrow: 1, + ...theme.typography.h4, + fontFamily: fonts.family.oswald, fontSize: '30px', - fontWeight: 'bold', - letterSpacing: '4px', + letterSpacing: '0.13em', + fontWeight: theme.typography.fontWeightBold, + flexGrow: 1, }, })); @@ -56,7 +59,7 @@ const Header = () => { return ( - + 311DATA @@ -81,13 +84,13 @@ const Header = () => { horizontal: 'left', }} > - - + + Overview - - + + Compare Two Neighborhoods @@ -98,9 +101,6 @@ const Header = () => { - - -