Skip to content

Commit 14534e0

Browse files
authored
Merge pull request #51471 from nextcloud/fix/grid-view-actions
fix(files): Ensure actions never overflow filename
2 parents 91c94f1 + 5f77b46 commit 14534e0

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

apps/files/src/components/FilesListVirtual.vue

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -864,8 +864,8 @@ export default defineComponent({
864864
.files-list--grid tbody.files-list__tbody {
865865
--item-padding: 16px;
866866
--icon-preview-size: 166px;
867-
--name-height: 32px;
868-
--mtime-height: 16px;
867+
--name-height: var(--default-clickable-area);
868+
--mtime-height: calc(var(--font-size-small) + var(--default-grid-baseline));
869869
--row-width: calc(var(--icon-preview-size) + var(--item-padding) * 2);
870870
--row-height: calc(var(--icon-preview-size) + var(--name-height) + var(--mtime-height) + var(--item-padding) * 2);
871871
--checkbox-padding: 0px;
@@ -947,7 +947,7 @@ export default defineComponent({
947947
.files-list__row-mtime {
948948
width: var(--icon-preview-size);
949949
height: var(--mtime-height);
950-
font-size: calc(var(--default-font-size) - 4px);
950+
font-size: var(--font-size-small);
951951
}
952952
953953
.files-list__row-actions {
@@ -958,4 +958,21 @@ export default defineComponent({
958958
height: var(--clickable-area);
959959
}
960960
}
961+
962+
@media screen and (max-width: 768px) {
963+
// there is no mtime
964+
.files-list--grid tbody.files-list__tbody {
965+
--mtime-height: 0px;
966+
967+
// so we move the action to the name
968+
.files-list__row-actions {
969+
inset-block-end: var(--item-padding);
970+
}
971+
972+
// and we need to keep space on the name for the actions
973+
.files-list__row-name-text {
974+
padding-inline-end: var(--clickable-area) !important;
975+
}
976+
}
977+
}
961978
</style>

cypress/e2e/files/scrolling.cy.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,7 @@ describe('files: Scrolling to selected file in file list (GRID MODE)', { testIso
228228
.and(beOverlappedByTableHeader)
229229
}
230230

231-
// see footer is only shown partly
232231
cy.get('tfoot')
233-
.should(notBeFullyInViewport)
234232
.contains('span', '12 files')
235233
.should('be.visible')
236234
})

dist/files-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)