fixup! Migrate NcModal to NcDialog

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
nextcloud · Jul 30, 2024 · adf2762 · adf2762
1 parent f420d03
commit adf2762
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/modules/modals/EditColumn.vue b/src/modules/modals/EditColumn.vue
@@ -17,15 +17,15 @@
 				</div>
 			</div>
 			<div class="buttons">
-				<div class="flex">
+				<div class="edit-info">
 					<ColumnInfoPopover :column="column" />&nbsp;
 					<div class="last-edit-info">
 						{{ t('tables', 'Last edit') + ': ' }}
 						{{ updateTime }}&nbsp;
-						<NcUserBubble :user="column.lastEditBy" :display-name="column.lastEditByDisplayName ? column.lastEditByDisplayName : column.lastEditBy" />
+						<NcUserBubble class="last-edit-info-bubble" :user="column.lastEditBy" :display-name="column.lastEditByDisplayName ? column.lastEditByDisplayName : column.lastEditBy" />
 					</div>
 				</div>
-				<div class="flex">
+				<div class="right-additional-button">
 					<div class="button-padding-right">
 						<NcButton type="secondary" :aria-label="t('tables', 'Cancel')" @click="actionCancel">
 							{{ t('tables', 'Cancel') }}
@@ -211,12 +211,24 @@ export default {
 .last-edit-info {
 	display: flex;
 	align-items: center;
+	flex-wrap: wrap;
 }
 
 .buttons :deep(.user-bubble__wrapper) {
 	padding-top: 5px;
 }
 
-.flex { display: flex }
+.edit-info {
+	display: flex;
+}
+
+.right-additional-button {
+	display: flex;
+	align-items: center;
+}
+
+.last-edit-info-bubble {
+	display: flex!important;
+}
 
 </style>
diff --git a/src/modules/modals/FileActionImport.vue b/src/modules/modals/FileActionImport.vue
@@ -1,6 +1,7 @@
 <template>
 	<NcDialog v-if="!importResults"
-		:name="t('tables', 'Import file into Tables')">
+		:name="t('tables', 'Import file into Tables')"
+		@closing="closeImportDialog">
 		<div class="modal__content">
 			<RowFormWrapper
 				class="row"
@@ -220,6 +221,9 @@ export default {
 
 			this.importingFile = false
 		},
+		closeImportDialog() {
+			this.$emit('close')
+		},
 	},
 }