diff --git a/src/components/AppBody.js b/src/components/AppBody.js index 435fde4..4af87ed 100644 --- a/src/components/AppBody.js +++ b/src/components/AppBody.js @@ -8,4 +8,6 @@ function AppBody ({ classes, children}) { ) } -export default withStyles({ backgroundColor: 'white'})(AppBody) \ No newline at end of file +export default withStyles({ appBody : { + minHeight: '93vh' +}})(AppBody) \ No newline at end of file diff --git a/src/components/Cards/Cards.js b/src/components/Cards/Cards.js index c4bdd7b..79d2940 100644 --- a/src/components/Cards/Cards.js +++ b/src/components/Cards/Cards.js @@ -38,18 +38,19 @@ function RenderAllCards({ cards, classes }) { const RenderAllCardsWithStyle = withStyles({ cardContainer: { display: "flex", - justifyContent: "center", - paddingTop: "1rem" + flexWrap: 'wrap', + padding: "1rem", + height: '100%' }, card: { width: "15rem", - marginRight: ".3rem", - marginLeft: ".3rem", + margin: '2%', }, cardDesc: { height: "5rem", textOverflow: "ellipsis", - overflow: "auto" + overflow: "auto", + marginBottom: '1.5em' } })(RenderAllCards); diff --git a/src/components/Locations/FluidPaper.js b/src/components/Locations/FluidPaper.js index 05912e5..8f19d97 100644 --- a/src/components/Locations/FluidPaper.js +++ b/src/components/Locations/FluidPaper.js @@ -1,5 +1,5 @@ import React from "react"; -import { Paper, withStyles, Card } from "@material-ui/core"; +import { withStyles, Card } from "@material-ui/core"; function FluidPaper({ children, classes }) { return {children}; diff --git a/src/components/NavBar.js b/src/components/NavBar.js index d87280d..488eb97 100644 --- a/src/components/NavBar.js +++ b/src/components/NavBar.js @@ -15,6 +15,9 @@ const styles = { grow: { flexGrow: 1, }, + appBar: { + height: '7vh' + }, menuButton: { marginLeft: "-.8em", marginRight: "1em", @@ -26,7 +29,7 @@ const styles = { const { classes } = props; return (
- + setOpenDraw(true)} className={classes.menuButton} color="inherit" aria-label="Menu"> diff --git a/src/reducers/locations.js b/src/reducers/locations.js index 54ea376..b8dd47e 100644 --- a/src/reducers/locations.js +++ b/src/reducers/locations.js @@ -11,7 +11,7 @@ export default function counter( rating: 4 }, 3: { - title: "Marginson's Loo", + title: "Marginson's Bog", description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. yo dawg", rating: 5,