Skip to content

Commit e7b0f83

Browse files
authored
Merge pull request #51658 from nextcloud/backport/51471/stable30
[stable30] fix(files): Ensure actions never overflow filename
2 parents c3d0afd + 6de1f24 commit e7b0f83

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
@@ -762,8 +762,8 @@ export default defineComponent({
762762
.files-list--grid tbody.files-list__tbody {
763763
--item-padding: 16px;
764764
--icon-preview-size: 166px;
765-
--name-height: 32px;
766-
--mtime-height: 16px;
765+
--name-height: var(--default-clickable-area);
766+
--mtime-height: calc(var(--font-size-small) + var(--default-grid-baseline));
767767
--row-width: calc(var(--icon-preview-size) + var(--item-padding) * 2);
768768
--row-height: calc(var(--icon-preview-size) + var(--name-height) + var(--mtime-height) + var(--item-padding) * 2);
769769
--checkbox-padding: 0px;
@@ -846,7 +846,7 @@ export default defineComponent({
846846
.files-list__row-mtime {
847847
width: var(--icon-preview-size);
848848
height: var(--mtime-height);
849-
font-size: calc(var(--default-font-size) - 4px);
849+
font-size: var(--font-size-small);
850850
}
851851
852852
.files-list__row-actions {
@@ -857,4 +857,21 @@ export default defineComponent({
857857
height: var(--clickable-area);
858858
}
859859
}
860+
861+
@media screen and (max-width: 768px) {
862+
// there is no mtime
863+
.files-list--grid tbody.files-list__tbody {
864+
--mtime-height: 0px;
865+
866+
// so we move the action to the name
867+
.files-list__row-actions {
868+
inset-block-end: var(--item-padding);
869+
}
870+
871+
// and we need to keep space on the name for the actions
872+
.files-list__row-name-text {
873+
padding-inline-end: var(--clickable-area) !important;
874+
}
875+
}
876+
}
860877
</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)