Skip to content

Commit

Permalink
Merge pull request #1668 from girder/style-adjustment
Browse files Browse the repository at this point in the history
Make default item lists look less different than before #1651
  • Loading branch information
manthey authored Oct 7, 2024
2 parents fcbf6cd + 616ccd9 commit 3f64bc7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

- Better handle images without enough tile layers ([#1648](../../pull/1648))
- Add users option to config files; have a default config file ([#1649](../../pull/1649))
- Remove no longer used code; adjust item list slightly ([#1651](../../pull/1651))
- Remove no longer used code; adjust item list slightly ([#1651](../../pull/1651), [#1668](../../pull/1668))
- Reduce updates when showing item lists; add a waiting spinner ([#1653](../../pull/1653))
- Update item lists check for large images when toggling recurse ([#1654](../../pull/1654))
- Support named item lists ([#1665](../../pull/1665))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ ul.g-item-list
&>li>.li-item-list-cell
display inline-block

ul.g-item-list[metadata-columns="0"]
.li-column-record-size
text-wrap no-wrap

.li-column-record-name
width 100%

.li-item-list-filter
padding-left 12px

Expand Down
3 changes: 2 additions & 1 deletion girder/girder_large_image/web_client/templates/itemList.pug
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ul.g-item-list.li-item-list(layout_mode=(itemList.layout || {}).mode || '')
- var metadataCount = itemList.columns.filter((col) => col.type === 'metadata').length
ul.g-item-list.li-item-list(layout_mode=(itemList.layout || {}).mode || '', metadata-columns=metadataCount)
- var colNames = [];
if items.length
li.li-item-list-header
Expand Down

0 comments on commit 3f64bc7

Please sign in to comment.