Skip to content

feat(files): reduce row height #53968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 3 commits into from
Jul 16, 2025
Merged

feat(files): reduce row height #53968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ef7700
feat(files): reduce row height
skjnldsv Jul 16, 2025
d1f0cee
fix(files): drag ghost image
skjnldsv Jul 16, 2025
4df98d5
chore(assets): Recompile assets
nextcloud-command Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files/src/components/DragAndDropNotice.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export default defineComponent({
justify-content: center;
width: 100%;
// Breadcrumbs height + row thead height
min-height: calc(58px + 55px);
min-height: calc(58px + 44px);
margin: 0;
user-select: none;
color: var(--color-text-maxcontrast);
Expand Down
22 changes: 12 additions & 10 deletions apps/files/src/components/DragAndDropPreview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default Vue.extend({
</script>

<style lang="scss">
$size: 32px;
$size: 28px;
$stack-shift: 6px;

.files-list-drag-image {
Expand All @@ -102,24 +102,24 @@ $stack-shift: 6px;
display: flex;
overflow: hidden;
align-items: center;
height: 44px;
padding: 6px 12px;
height: $size + $stack-shift;
padding: $stack-shift $stack-shift * 2;
background: var(--color-main-background);

&__icon,
.files-list__row-icon {
.files-list__row-icon-preview-container {
display: flex;
overflow: hidden;
align-items: center;
justify-content: center;
width: 32px;
height: 32px;
width: $size - $stack-shift;
height: $size - $stack-shift;;
border-radius: var(--border-radius);
}

&__icon {
overflow: visible;
margin-inline-end: 12px;
margin-inline-end: $stack-shift * 2;

img {
max-width: 100%;
Expand All @@ -138,13 +138,15 @@ $stack-shift: 6px;
display: flex;

// Stack effect if more than one element
.files-list__row-icon + .files-list__row-icon {
// Max 3 elements
> .files-list__row-icon-preview-container + .files-list__row-icon-preview-container {
margin-top: $stack-shift;
margin-inline-start: $stack-shift - $size;
& + .files-list__row-icon {
margin-inline-start: $stack-shift * 2 - $size;
& + .files-list__row-icon-preview-container {
margin-top: $stack-shift * 2;
}
}

// If we have manually clone the preview,
// let's hide any fallback icons
&:not(:empty) + * {
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/components/FileEntry/FavoriteIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ export default defineComponent({
:deep() {
svg {
// We added a stroke for a11y so we must increase the size to include the stroke
width: 26px !important;
height: 26px !important;
width: 20px !important;
height: 20px !important;

// Override NcIconSvgWrapper defaults of 20px
max-width: unset !important;
Expand Down
8 changes: 4 additions & 4 deletions apps/files/src/components/FilesListVirtual.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,13 +481,13 @@ export default defineComponent({

<style scoped lang="scss">
.files-list {
--row-height: 55px;
--row-height: 44px;
--cell-margin: 14px;

--checkbox-padding: calc((var(--row-height) - var(--checkbox-size)) / 2);
--checkbox-size: 24px;
--clickable-area: var(--default-clickable-area);
--icon-preview-size: 32px;
--icon-preview-size: 24px;

--fixed-block-start-position: var(--default-clickable-area);
display: flex;
Expand Down Expand Up @@ -775,8 +775,8 @@ export default defineComponent({
// File and folder overlay
&-overlay {
position: absolute;
max-height: calc(var(--icon-preview-size) * 0.5);
max-width: calc(var(--icon-preview-size) * 0.5);
max-height: calc(var(--icon-preview-size) * 0.6);
max-width: calc(var(--icon-preview-size) * 0.6);
color: var(--color-primary-element-text);
// better alignment with the folder icon
margin-block-start: 2px;
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/components/VirtualList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default defineComponent({
itemHeight() {
// Align with css in FilesListVirtual
// 166px + 32px (name) + 16px (mtime) + 16px (padding top and bottom)
return this.gridMode ? (166 + 32 + 16 + 16 + 16) : 55
return this.gridMode ? (166 + 32 + 16 + 16 + 16) : 44
},

// Grid mode only
Expand Down
4 changes: 2 additions & 2 deletions dist/files-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading