Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Sanity Exhibition Nansen
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
uib-ub
Spesialsamlingene
Utstillinger
Sanity Exhibition Nansen
Commits
8084a481
Commit
8084a481
authored
3 years ago
by
Tarje.Lavik
Browse files
Options
Downloads
Patches
Plain Diff
Fix height setting on HMO and Mirador
parent
4e428f8f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
web/components/Documents/HumanMadeObject.js
+8
-4
8 additions, 4 deletions
web/components/Documents/HumanMadeObject.js
web/components/MiradorViewer/index.js
+9
-2
9 additions, 2 deletions
web/components/MiradorViewer/index.js
with
17 additions
and
6 deletions
web/components/Documents/HumanMadeObject.js
+
8
−
4
View file @
8084a481
...
...
@@ -78,14 +78,18 @@ export default function HumanMadeObject(item) {
<
/Container
>
{
item
.
subjectOfManifest
&&
(
<
Box
h
=
"
70vh
"
gridArea
=
"
image
"
>
<
MiradorWithNoSSR
manifests
=
{[{
manifest
:
item
.
subjectOfManifest
}]}
/
>
<
Box
gridArea
=
"
image
"
>
<
MiradorWithNoSSR
manifests
=
{[{
manifest
:
item
.
subjectOfManifest
}]}
height
=
"
70vh
"
/>
<
/Box
>
)}
{
item
.
manifest
&&
!
item
.
subjectOfManifest
&&
(
<
Box
h
=
"
70vh
"
gridArea
=
"
image
"
>
<
MiradorWithNoSSR
hideWindowTitle
=
"
true
"
manifests
=
{[{
manifest
:
item
.
manifest
}]}
/
>
<
Box
gridArea
=
"
image
"
>
<
MiradorWithNoSSR
hideWindowTitle
=
"
true
"
manifests
=
{[{
manifest
:
item
.
manifest
}]}
height
=
"
70vh
"
/>
<
/Box
>
)}
...
...
This diff is collapsed.
Click to expand it.
web/components/MiradorViewer/index.js
+
9
−
2
View file @
8084a481
...
...
@@ -102,7 +102,14 @@ export default function MiradorViewer(props) {
const
mode
=
useColorModeValue
(
'
light
'
,
'
dark
'
)
const
ID
=
`mirador-
${
nanoid
()}
`
const
{
variant
,
manifests
,
workspaceControlPanel
=
false
,
gridArea
,
catalog
}
=
props
const
{
variant
,
manifests
,
workspaceControlPanel
=
false
,
gridArea
,
catalog
,
height
=
'
50vh
'
,
}
=
props
const
{
variantSettings
,
plugins
}
=
getVariant
(
variant
)
const
windows
=
manifests
?
mergeManifestAndVariant
(
manifests
,
variantSettings
)
:
null
...
...
@@ -172,7 +179,7 @@ export default function MiradorViewer(props) {
},
[
mode
])
return
(
<
Box
h
=
"
50vh
"
position
=
"
relative
"
gridArea
=
{
gridArea
}
bgColor
=
"
#eeeeee
"
>
<
Box
h
=
{
height
}
position
=
"
relative
"
gridArea
=
{
gridArea
}
bgColor
=
"
#eeeeee
"
>
<
Box
h
=
"
100%
"
id
=
{
ID
}
/
>
<
/Box
>
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment