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
8b56e610
Unverified
Commit
8b56e610
authored
Apr 16, 2019
by
Jack Reed
Committed by
GitHub
Apr 16, 2019
Browse files
Options
Downloads
Plain Diff
Merge pull request #2525 from ProjectMirador/resize-left-companion
Make left companion windows resizable
parents
8ec919d7
fe5674e8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/CompanionWindow.js
+5
-1
5 additions, 1 deletion
src/components/CompanionWindow.js
src/containers/CompanionArea.js
+1
-1
1 addition, 1 deletion
src/containers/CompanionArea.js
with
6 additions
and
2 deletions
src/components/CompanionWindow.js
+
5
−
1
View file @
8b56e610
...
@@ -33,6 +33,10 @@ export class CompanionWindow extends Component {
...
@@ -33,6 +33,10 @@ export class CompanionWindow extends Component {
return
{
...
base
,
left
:
true
};
return
{
...
base
,
left
:
true
};
}
}
if
(
position
===
'
left
'
)
{
return
{
...
base
,
right
:
true
};
}
if
(
position
===
'
bottom
'
||
position
===
'
far-bottom
'
)
{
if
(
position
===
'
bottom
'
||
position
===
'
far-bottom
'
)
{
return
{
...
base
,
top
:
true
};
return
{
...
base
,
top
:
true
};
}
}
...
@@ -71,7 +75,7 @@ export class CompanionWindow extends Component {
...
@@ -71,7 +75,7 @@ export class CompanionWindow extends Component {
disableDragging
disableDragging
enableResizing
=
{
this
.
resizeHandles
()}
enableResizing
=
{
this
.
resizeHandles
()}
minHeight
=
{
50
}
minHeight
=
{
50
}
minWidth
=
{
100
}
minWidth
=
{
position
===
'
left
'
?
235
:
100
}
>
>
<
Toolbar
className
=
{[
classes
.
toolbar
,
size
.
width
<
370
?
classes
.
small
:
null
,
ns
(
'
companion-window-header
'
)].
join
(
'
'
)}
disableGutters
>
<
Toolbar
className
=
{[
classes
.
toolbar
,
size
.
width
<
370
?
classes
.
small
:
null
,
ns
(
'
companion-window-header
'
)].
join
(
'
'
)}
disableGutters
>
...
...
This diff is collapsed.
Click to expand it.
src/containers/CompanionArea.js
+
1
−
1
View file @
8b56e610
...
@@ -25,7 +25,7 @@ const styles = theme => ({
...
@@ -25,7 +25,7 @@ const styles = theme => ({
width
:
'
100%
'
,
width
:
'
100%
'
,
},
},
left
:
{
left
:
{
w
idth
:
235
,
minW
idth
:
235
,
},
},
root
:
{
root
:
{
display
:
'
flex
'
,
display
:
'
flex
'
,
...
...
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