Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mirador Video
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
IIIF
Mirador
Mirador Video
Commits
b924302b
Unverified
Commit
b924302b
authored
1 year ago
by
Justin Coyne
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #3837 from ProjectMirador/mui5-window
Pull Window styles up
parents
66bce438
08760874
No related branches found
No related tags found
2 merge requests
!19
Draft: Merge video support into mui5
,
!18
Only nudge over badge content for the WindowListButton; it needs special...
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/components/Window.js
+21
-19
21 additions, 19 deletions
src/components/Window.js
with
21 additions
and
19 deletions
src/components/Window.js
+
21
−
19
View file @
b924302b
...
...
@@ -12,6 +12,23 @@ import ErrorContent from '../containers/ErrorContent';
import
IIIFAuthentication
from
'
../containers/IIIFAuthentication
'
;
import
{
PluginHook
}
from
'
./PluginHook
'
;
const
Root
=
styled
(
Paper
)(({
ownerState
,
theme
})
=>
({
backgroundColor
:
theme
.
palette
.
shades
?.
dark
,
borderRadius
:
0
,
display
:
'
flex
'
,
flexDirection
:
'
column
'
,
height
:
'
100%
'
,
minHeight
:
0
,
overflow
:
'
hidden
'
,
width
:
'
100%
'
,
...(
ownerState
?.
maximized
&&
{
left
:
0
,
position
:
'
absolute
'
,
top
:
0
,
zIndex
:
theme
.
zIndex
.
modal
-
1
,
}),
}));
const
StyledMiddle
=
styled
(
'
div
'
)(()
=>
({
display
:
'
flex
'
,
flex
:
'
1
'
,
...
...
@@ -96,7 +113,7 @@ export class Window extends Component {
*/
render
()
{
const
{
focusWindow
,
label
,
isFetching
,
maximized
,
sideBarOpen
,
focusWindow
,
label
,
isFetching
,
sideBarOpen
,
view
,
windowId
,
t
,
manifestError
,
}
=
this
.
props
;
...
...
@@ -112,27 +129,12 @@ export class Window extends Component {
}
return
(
<
Paper
<
Root
onFocus
=
{
focusWindow
}
ownerState
=
{
this
.
props
}
component
=
"
section
"
elevation
=
{
1
}
id
=
{
windowId
}
sx
=
{
theme
=>
({
bgcolor
:
'
shades?.dark
'
,
borderRadius
:
0
,
display
:
'
flex
'
,
flexDirection
:
'
column
'
,
height
:
'
100%
'
,
minHeight
:
0
,
overflow
:
'
hidden
'
,
width
:
'
100%
'
,
...(
maximized
&&
{
left
:
0
,
position
:
'
absolute
'
,
top
:
0
,
zIndex
:
theme
.
zIndex
.
modal
-
1
,
}),
})}
className
=
{
ns
(
'
window
'
)}
aria
-
label
=
{
t
(
'
window
'
,
{
label
})}
>
...
...
@@ -159,7 +161,7 @@ export class Window extends Component {
<
/StyledMiddle
>
<
CompanionArea
windowId
=
{
windowId
}
position
=
"
far-bottom
"
/>
<
PluginHook
{...
this
.
props
}
/
>
<
/
Paper
>
<
/
Root
>
);
}
}
...
...
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