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
6c038d97
Commit
6c038d97
authored
4 years ago
by
Jack Reed
Browse files
Options
Downloads
Patches
Plain Diff
Move List -> Menus for similarity with other types of elements
parent
179253e9
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/WindowSideBarCollectionPanel.js
+9
-7
9 additions, 7 deletions
src/components/WindowSideBarCollectionPanel.js
src/containers/WindowSideBarCollectionPanel.js
+2
-1
2 additions, 1 deletion
src/containers/WindowSideBarCollectionPanel.js
with
11 additions
and
8 deletions
src/components/WindowSideBarCollectionPanel.js
+
9
−
7
View file @
6c038d97
...
...
@@ -4,6 +4,8 @@ import List from '@material-ui/core/List';
import
ListItem
from
'
@material-ui/core/ListItem
'
;
import
ListItemIcon
from
'
@material-ui/core/ListItemIcon
'
;
import
ListItemText
from
'
@material-ui/core/ListItemText
'
;
import
MenuList
from
'
@material-ui/core/MenuList
'
;
import
MenuItem
from
'
@material-ui/core/MenuItem
'
;
import
Typography
from
'
@material-ui/core/Typography
'
;
import
Skeleton
from
'
@material-ui/lab/Skeleton
'
;
import
ArrowUpwardIcon
from
'
@material-ui/icons/ArrowUpwardSharp
'
;
...
...
@@ -54,8 +56,8 @@ export class WindowSideBarCollectionPanel extends Component {
/** */
const
Item
=
({
manifest
,
...
otherProps
})
=>
(
<
List
Item
className
=
{
classes
.
list
Item
}
<
Menu
Item
className
=
{
classes
.
menu
Item
}
alignItems
=
"
flex-start
"
button
component
=
"
li
"
...
...
@@ -72,7 +74,7 @@ export class WindowSideBarCollectionPanel extends Component {
<
/ListItemIcon
>
)}
<
ListItemText
>
{
WindowSideBarCollectionPanel
.
getUseableLabel
(
manifest
)}
<
/ListItemText
>
<
/
List
Item
>
<
/
Menu
Item
>
);
return
(
...
...
@@ -106,15 +108,15 @@ export class WindowSideBarCollectionPanel extends Component {
<
/
>
)}
>
<
List
>
<
Menu
List
>
{
isFetching
&&
(
<
List
Item
>
<
Menu
Item
>
<
ListItemText
>
<
Skeleton
className
=
{
classes
.
placeholder
}
variant
=
"
text
"
/>
<
Skeleton
className
=
{
classes
.
placeholder
}
variant
=
"
text
"
/>
<
Skeleton
className
=
{
classes
.
placeholder
}
variant
=
"
text
"
/>
<
/ListItemText
>
<
/
List
Item
>
<
/
Menu
Item
>
)}
{
collection
&&
collection
.
getCollections
().
map
((
manifest
)
=>
{
...
...
@@ -144,7 +146,7 @@ export class WindowSideBarCollectionPanel extends Component {
);
})
}
<
/List
>
<
/
Menu
List
>
<
/CompanionWindow
>
);
}
...
...
This diff is collapsed.
Click to expand it.
src/containers/WindowSideBarCollectionPanel.js
+
2
−
1
View file @
6c038d97
...
...
@@ -63,9 +63,10 @@ const styles = theme => ({
label
:
{
paddingLeft
:
theme
.
spacing
(
1
),
},
list
Item
:
{
menu
Item
:
{
borderBottom
:
`0.5px solid
${
theme
.
palette
.
divider
}
`
,
paddingRight
:
theme
.
spacing
(
1
),
whiteSpace
:
'
normal
'
,
},
});
...
...
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