diff options
author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-08-23 19:52:42 +0200 |
---|---|---|
committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-08-26 16:31:25 +0200 |
commit | b1eecde452e7cfc6338e3903899bfd34fa2721e9 (patch) | |
tree | 223b43f5503bcc8e21fa978f674a2f1ad6298820 /apps | |
parent | c6ec82203e3615f1493bbb230eea8e2fba9abfa8 (diff) | |
download | nextcloud-server-b1eecde452e7cfc6338e3903899bfd34fa2721e9.tar.gz nextcloud-server-b1eecde452e7cfc6338e3903899bfd34fa2721e9.zip |
fix(files): Remove huge margin on bottom
Instead make it relative to screen size.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/src/components/FilesListTableFooter.vue | 14 | ||||
-rw-r--r-- | apps/files/src/components/FilesListVirtual.vue | 5 |
2 files changed, 6 insertions, 13 deletions
diff --git a/apps/files/src/components/FilesListTableFooter.vue b/apps/files/src/components/FilesListTableFooter.vue index debace7a681..bf545aacf4f 100644 --- a/apps/files/src/components/FilesListTableFooter.vue +++ b/apps/files/src/components/FilesListTableFooter.vue @@ -50,6 +50,7 @@ import { defineComponent } from 'vue' import { useFilesStore } from '../store/files.ts' import { usePathsStore } from '../store/paths.ts' +import { useRouteParameters } from '../composables/useRouteParameters.ts' export default defineComponent({ name: 'FilesListTableFooter', @@ -84,27 +85,24 @@ export default defineComponent({ setup() { const pathsStore = usePathsStore() const filesStore = useFilesStore() + const { directory } = useRouteParameters() return { filesStore, pathsStore, + directory, } }, computed: { - dir() { - // Remove any trailing slash but leave root slash - return (this.$route?.query?.dir || '/').replace(/^(.+)\/$/, '$1') - }, - currentFolder() { if (!this.currentView?.id) { return } - if (this.dir === '/') { + if (this.directory === '/') { return this.filesStore.getRoot(this.currentView.id) } - const fileId = this.pathsStore.getPath(this.currentView.id, this.dir)! + const fileId = this.pathsStore.getPath(this.currentView.id, this.directory)! return this.filesStore.getNode(fileId) }, @@ -143,7 +141,7 @@ export default defineComponent({ <style scoped lang="scss"> // Scoped row tr { - margin-bottom: 300px; + margin-bottom: max(25vh, var(--body-container-margin)); border-top: 1px solid var(--color-border); // Prevent hover effect on the whole row background-color: transparent !important; diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue index cb38d744738..75f57924984 100644 --- a/apps/files/src/components/FilesListVirtual.vue +++ b/apps/files/src/components/FilesListVirtual.vue @@ -427,11 +427,6 @@ export default defineComponent({ top: var(--fixed-top-position); } - // Table footer - .files-list__tfoot { - min-height: 300px; - } - tr { position: relative; display: flex; |