Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/8.3' into 8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
markusguenther committed Feb 5, 2024
2 parents 61dac99 + fe77db3 commit 8192d44
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ aliases:
jobs:
checkout:
docker:
- image: cimg/node:16.17-browsers
- image: cimg/node:20.9-browsers
environment:
FLOW_CONTEXT: Production
steps:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.16
20.9
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test-update-snapshots": "yarn test -u"
},
"engines": {
"node": "~16"
"node": "~20"
},
"devDependencies": {
"@neos-project/eslint-config-neos": "^2.6.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
.multiLineWithThumbnail__item {
display: grid;
grid-template-columns: auto 1fr;
column-gap: var(--spacing-Half);
align-items: start;
box-sizing: content-box;
background: var(--colors-ContrastDarkest);
}

.multiLineWithThumbnail__item span {
grid-column: 2;
grid-row: 1;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

&.multiLineWithThumbnail__secondaryLabel {
grid-row: 2;
}

&.multiLineWithThumbnail__tertiaryLabel {
grid-row: 3;
}
}

.multiLineWithThumbnail__item--multiLine {
line-height: 20px;
}
Expand All @@ -26,6 +46,8 @@
.multiLineWithThumbnail__image {
width: calc(1.33 * (var(--spacing-GoldenUnit) + var(--spacing-Full)));
height: calc(var(--spacing-GoldenUnit) + var(--spacing-Full));
grid-column: 1;
grid-row: 1 / 4;
object-fit: contain;
background-color: #fff;
background-size: 10px 10px;
Expand All @@ -35,8 +57,7 @@
display: inline-block;
vertical-align: middle;
margin-left: calc(var(--spacing-Full) * -1);
margin-top: calc(var(--spacing-Half) * -1);
margin-bottom: calc(var(--spacing-Half) * -1);
align-self: center;
}

.multiLineWithThumbnail__item:hover .multiLineWithThumbnail__secondaryLabel,
Expand Down

0 comments on commit 8192d44

Please sign in to comment.