Fixed height issues! Finally!!!
This commit is contained in:
parent
fbf2b42065
commit
062eccb379
@ -152,7 +152,6 @@ const BackstoryApp = () => {
|
|||||||
/>
|
/>
|
||||||
</Routes>
|
</Routes>
|
||||||
</UserProvider>
|
</UserProvider>
|
||||||
|
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -94,7 +94,15 @@ interface BackstoryPageContainerProps {
|
|||||||
const BackstoryPageContainer = (props : BackstoryPageContainerProps) => {
|
const BackstoryPageContainer = (props : BackstoryPageContainerProps) => {
|
||||||
const { children, sx } = props;
|
const { children, sx } = props;
|
||||||
return (
|
return (
|
||||||
<Container maxWidth="xl" sx={{ mt: 2, mb: 2, ...sx }}>
|
<Container
|
||||||
|
className="BackstoryPageContainer"
|
||||||
|
maxWidth="xl"
|
||||||
|
sx={{
|
||||||
|
pt: 1,
|
||||||
|
pb: 1,
|
||||||
|
flexGrow: 1,
|
||||||
|
...sx
|
||||||
|
}}>
|
||||||
<Paper
|
<Paper
|
||||||
elevation={2}
|
elevation={2}
|
||||||
sx={{
|
sx={{
|
||||||
@ -139,15 +147,27 @@ const BackstoryLayout: React.FC<{
|
|||||||
return (
|
return (
|
||||||
<Box sx={{ height: "100%", maxHeight: "100%", minHeight: "100%", flexDirection: "column" }}>
|
<Box sx={{ height: "100%", maxHeight: "100%", minHeight: "100%", flexDirection: "column" }}>
|
||||||
<Header {...{ setSnack, sessionId, user, currentPath: page, navigate, navigationLinks }} />
|
<Header {...{ setSnack, sessionId, user, currentPath: page, navigate, navigationLinks }} />
|
||||||
<Box sx={{ display: "flex", maxHeight: "100%", flex: 1, m: 0, p: 0, flexDirection: "column" }}>
|
<Box sx={{
|
||||||
|
display: "flex",
|
||||||
|
width: "100%",
|
||||||
|
maxHeight: "100%",
|
||||||
|
minHeight: "100%",
|
||||||
|
flex: 1,
|
||||||
|
m: 0,
|
||||||
|
p: 0,
|
||||||
|
flexDirection: "column",
|
||||||
|
backgroundColor: "#D3CDBF", /* Warm Gray */
|
||||||
|
}}>
|
||||||
<Scrollable
|
<Scrollable
|
||||||
|
className="BackstoryPageScrollable"
|
||||||
sx={{
|
sx={{
|
||||||
display: "flex",
|
display: "flex",
|
||||||
flexDirection: "column",
|
flexDirection: "column",
|
||||||
backgroundColor: "background.default",
|
backgroundColor: "background.default",
|
||||||
|
height: "100%",
|
||||||
maxHeight: "100%",
|
maxHeight: "100%",
|
||||||
minHeight: "100%",
|
minHeight: "100%",
|
||||||
mt: "72px"
|
mt: "72px" /* Needs to be kept in sync with the height of Header if the Header theme changes */
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<BackstoryPageContainer>
|
<BackstoryPageContainer>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user