Skip to content
Snippets Groups Projects
Commit 4eb3c7a7 authored by Tarje Lavik's avatar Tarje Lavik
Browse files

Fix height problem on mirador based comps

parent a6cd61b0
No related branches found
No related tags found
No related merge requests found
...@@ -86,26 +86,24 @@ export default function HumanMadeObject(item) { ...@@ -86,26 +86,24 @@ export default function HumanMadeObject(item) {
<CurrentOwner owners={item.hasCurrentOwner} /> <CurrentOwner owners={item.hasCurrentOwner} />
} }
</Grid> </Grid>
{item.activityStream && {item.activityStream &&
<ActivityStream stream={item.activityStream} /> <ActivityStream stream={item.activityStream} />
} }
</Container> </Container>
{item.subjectOfManifest && ( {item.subjectOfManifest && (
<Box gridArea="image"> <Box h="70vh" gridArea="image">
<MiradorWithNoSSR <MiradorWithNoSSR
h="70vh"
manifests={[{manifest: item.subjectOfManifest}]} manifests={[{manifest: item.subjectOfManifest}]}
/> />
</Box> </Box>
)} )}
{item.manifest && !item.subjectOfManifest && ( {item.manifest && !item.subjectOfManifest && (
<Box gridArea="image"> <Box h="70vh" gridArea="image">
<MiradorWithNoSSR <MiradorWithNoSSR
hideWindowTitle="true" hideWindowTitle="true"
h="70vh"
manifests={[{manifest: item.manifest}]} manifests={[{manifest: item.manifest}]}
/> />
</Box> </Box>
......
...@@ -106,8 +106,7 @@ export default function MiradorViewer(props) { ...@@ -106,8 +106,7 @@ export default function MiradorViewer(props) {
manifests, manifests,
workspaceControlPanel = false, workspaceControlPanel = false,
gridArea, gridArea,
catalog, catalog
h = '50vh',
} = props } = props
const {variantSettings, plugins} = getVariant(variant) const {variantSettings, plugins} = getVariant(variant)
...@@ -178,9 +177,10 @@ export default function MiradorViewer(props) { ...@@ -178,9 +177,10 @@ export default function MiradorViewer(props) {
return ( return (
<Box <Box
h="100%"
position="relative" position="relative"
gridArea={gridArea} gridArea={gridArea}
h={h} bgGradient="linear(to-t, blue.100, white)"
> >
<Box h="100%" id={ID} /> <Box h="100%" id={ID} />
</Box> </Box>
......
...@@ -9,14 +9,14 @@ export default function MiradorGallery(props) { ...@@ -9,14 +9,14 @@ export default function MiradorGallery(props) {
return null return null
} }
const {items, h} = props const {items} = props
return ( return (
<Grid <Grid
h="50vh"
maxW={["xl", "xl", "xl", "6xl"]} maxW={["xl", "xl", "xl", "6xl"]}
my={{base: "6", md: "16", xl: "28"}} my={{base: "6", md: "16", xl: "28"}}
gridGap={5} gridGap={5}
alignContent="start"
gridTemplateAreas={{base: '"image" "metadata"', xl: '"image metadata"'}} gridTemplateAreas={{base: '"image" "metadata"', xl: '"image metadata"'}}
gridTemplateColumns={{base: '100%', xl: '10fr 4fr'}} gridTemplateColumns={{base: '100%', xl: '10fr 4fr'}}
> >
...@@ -25,7 +25,6 @@ export default function MiradorGallery(props) { ...@@ -25,7 +25,6 @@ export default function MiradorGallery(props) {
gridArea="image" gridArea="image"
variant="standard" variant="standard"
manifests={items} manifests={items}
h={h}
/> />
<Box fontFamily="Montserrat" gridArea="metadata" pr="10"> <Box fontFamily="Montserrat" gridArea="metadata" pr="10">
......
...@@ -14,20 +14,19 @@ export default function SingleObject(props) { ...@@ -14,20 +14,19 @@ export default function SingleObject(props) {
return ( return (
<Grid <Grid
h="50vh"
maxW={["xl", "xl", "xl", "6xl"]} maxW={["xl", "xl", "xl", "6xl"]}
my={{base: "6", md: "16", xl: "28"}} my={{base: "6", md: "16", xl: "28"}}
borderBottom={{base: "solid 1px", md: "none"}} borderBottom={{base: "solid 1px", md: "none"}}
borderColor="gray.300" borderColor="gray.300"
gridGap={5} gridGap={5}
alignContent="start"
gridTemplateAreas={{base: '"image" "metadata"', xl: '"image metadata"'}} gridTemplateAreas={{base: '"image" "metadata"', xl: '"image metadata"'}}
gridTemplateColumns={{base: '3xl', xl: '10fr 4fr'}} gridTemplateColumns={{base: '3xl', xl: '10fr 4fr'}}
> >
<MiradorWithNoSSR <MiradorWithNoSSR
gridArea="image" gridArea="image"
variant="basic" variant="basic"
h="50vh"
manifests={[{ manifests={[{
manifest: item.manifest, manifest: item.manifest,
...(canvasUrl && {canvasUrl: canvasUrl}) ...(canvasUrl && {canvasUrl: canvasUrl})
...@@ -35,6 +34,7 @@ export default function SingleObject(props) { ...@@ -35,6 +34,7 @@ export default function SingleObject(props) {
/> />
<Flex <Flex
h="full"
flexDirection="column" flexDirection="column"
fontFamily="Montserrat" fontFamily="Montserrat"
gridArea="metadata" gridArea="metadata"
...@@ -59,7 +59,6 @@ export default function SingleObject(props) { ...@@ -59,7 +59,6 @@ export default function SingleObject(props) {
)} )}
<Spacer /> <Spacer />
<Source {...item} /> <Source {...item} />
</Flex> </Flex>
</Grid> </Grid>
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment