diff options
Diffstat (limited to 'apps/files/src')
| -rw-r--r-- | apps/files/src/actions/deleteAction.ts | 2 | ||||
| -rw-r--r-- | apps/files/src/components/FileEntry.vue | 5 | ||||
| -rw-r--r-- | apps/files/src/components/FilesListVirtual.vue | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/apps/files/src/actions/deleteAction.ts b/apps/files/src/actions/deleteAction.ts index 528a0faecab..04c139fe38e 100644 --- a/apps/files/src/actions/deleteAction.ts +++ b/apps/files/src/actions/deleteAction.ts @@ -31,7 +31,7 @@ export const action = new FileAction({ id: 'delete', displayName(nodes: Node[], view: View) { return view.id === 'trashbin' - ? t('files_trashbin', 'Delete permanently') + ? t('files', 'Delete permanently') : t('files', 'Delete') }, iconSvgInline: () => TrashCanSvg, diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue index 81a61843db0..83b991dcd50 100644 --- a/apps/files/src/components/FileEntry.vue +++ b/apps/files/src/components/FileEntry.vue @@ -109,9 +109,11 @@ <!-- Render actions --> <CustomElementRender v-for="action in enabledRenderActions" :key="action.id" + :class="'files-list__row-action-' + action.id" :current-view="currentView" :render="action.renderInline" - :source="source" /> + :source="source" + class="files-list__row-action--inline" /> <!-- Menu actions --> <NcActions v-if="visible" @@ -119,6 +121,7 @@ :boundaries-element="getBoundariesElement()" :container="getBoundariesElement()" :disabled="source._loading" + :force-name="true" :force-menu="enabledInlineActions.length === 0 /* forceMenu only if no inline actions */" :inline="enabledInlineActions.length" :open.sync="openedMenu"> diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue index ace8d87fc8c..cd41a179ce9 100644 --- a/apps/files/src/components/FilesListVirtual.vue +++ b/apps/files/src/components/FilesListVirtual.vue @@ -461,6 +461,10 @@ export default Vue.extend({ } } + .files-list__row-action--inline { + margin-right: 7px; + } + .files-list__row-mtime, .files-list__row-size { // Right align text |