Commit be2e137c authored by Elisabeth Reuhl's avatar Elisabeth Reuhl
Browse files

Fix overlapping and bad alignment of dashboard tiles

parent 1d143ed6
......@@ -50,8 +50,8 @@ export const Layout = (props) => {
lg={12}
container
direction="column"
spacing={2}
direction="row"
spacing={0}
>
{
// whichever tile was enlarged by the user
......@@ -85,8 +85,8 @@ export const Layout = (props) => {
lg={rightTileIsMovedToBottomInstead ? 12 : 8}
container
direction={rightTileIsMovedToBottomInstead ? "column" : "row"}
spacing={2}
direction={rightTileIsMovedToBottomInstead ? /*TODO: needs something like 'if not small screen' && */"column" : "row"}
spacing={0}
>
<Grid
......@@ -100,7 +100,7 @@ export const Layout = (props) => {
direction="row"
>
{
// areaA (if not enlarged, in that case: areaB)
// areaA (if not enlarged, in that case areaB moves here)
topRightOrMiddleTile
}
</Grid>
......
import React from "react";
import { Button, Card, Grid } from "@material-ui/core";
import { useTranslation } from "react-i18next";
import { useStyles } from "../../styles";
import { ArrowLeft, ArrowRight } from "@material-ui/icons";
import { makeStyles } from "@material-ui/core/styles";
......@@ -16,7 +15,7 @@ const localStyles = makeStyles(theme => ({
borderBottomLeftRadius: "30px"
},
showNextGrid: {
maxHeight: "5%",
height: "35px",
justifyContent:"space-between",
alignItems:"center",
}
......@@ -30,7 +29,6 @@ export const ShowNext = (props) => {
const { t, i18n } = useTranslation();
const classes = useStyles();
const localClasses = localStyles();
......
......@@ -14,14 +14,14 @@ const useStyles = makeStyles(theme => ({
overflow: "scroll"
},
fullHeightTile: {
height: "100vh"
height: "calc(100vh - 35px)" //35px is the height of the ShowNext bar
},
halfHeightTile: {
height: "45vh"
height: "calc(45vh - 35px)" //35px is the height of the ShowNext bar
},
"gridBody || fullHeightTile || halfHeightTile": {
justifyContent: "space-between",
alignItems: "center"
//justifyContent: "space-between",
//alignItems: "center"
},
gridHead: {
//minHeight: "5%",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment