Merge pull request #31319 from nextcloud/fix/31246/fix-modals

fix all modals after vue 5.0
nextcloud · Feb 23, 2022 · 9630d65 · 9630d65
2 parents bf4acd5 + 1116529
commit 9630d65
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 44 deletions.
diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/App.vue
@@ -34,7 +34,7 @@
 				@keyup.space="showModal">{{ t('dashboard', 'Customize') }}</a>
 		</div>
 
-		<Modal v-if="modal" @close="closeModal">
+		<Modal v-if="modal" size="normal" @close="closeModal">
 			<div class="modal__content">
 				<h3>{{ t('dashboard', 'Edit widgets') }}</h3>
 				<ol class="panels">
@@ -553,9 +553,7 @@ export default {
 
 .modal__content {
 	padding: 32px 16px;
-	max-height: 70vh;
 	text-align: center;
-	overflow: auto;
 
 	ol {
 		display: flex;

diff --git a/apps/files/src/views/TemplatePicker.vue b/apps/files/src/views/TemplatePicker.vue
@@ -286,7 +286,7 @@ export default {
 	// Make sure we're relative for the loading emptycontent on top
 	::v-deep .modal-container {
 		position: relative;
-		overflow-y: auto !important;
+		height: fit-content;
 	}
 
 	&__loading {

diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
@@ -22,7 +22,7 @@
 
 <template>
 	<div id="app-content" class="user-list-grid" @scroll.passive="onScroll">
-		<Modal v-if="showConfig.showNewUserForm" @close="closeModal">
+		<Modal v-if="showConfig.showNewUserForm" size="small" @close="closeModal">
 			<form id="new-user"
 				:disabled="loading.all"
 				class="modal__content"
@@ -598,7 +598,6 @@ export default {
 		flex-direction: column;
 		align-items: center;
 		text-align: center;
-		overflow: auto;
 	}
 	.modal__item {
 		margin-bottom: 16px;

diff --git a/apps/user_status/src/components/SetStatusModal.vue b/apps/user_status/src/components/SetStatusModal.vue
@@ -233,29 +233,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// TODO: can be removed once migrated to @nextcloud-vue >= 5.0
-::v-deep {
-	.modal-wrapper {
-		.prev, .next {
-			display: none !important;
-		}
-
-		.modal-container {
-			max-height: 100% !important;
-		}
-	}
-
-	.modal-header .modal-title {
-		display: none;
-	}
-}
 
 .set-status-modal {
-	min-height: 200px;
 	padding: 8px 20px 20px 20px;
-	// Enable scrollbar for too long content, same way as in Dashboard customize
-	max-height: 95vh;
-	overflow: auto;
 
 	&__header {
 		text-align: center;

diff --git a/dist/dashboard-main.js b/dist/dashboard-main.js
diff --git a/dist/dashboard-main.js.map b/dist/dashboard-main.js.map
diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map
diff --git a/dist/settings-users-351.js b/dist/settings-users-351.js
diff --git a/dist/settings-users-351.js.map b/dist/settings-users-351.js.map
diff --git a/dist/settings-vue-settings-apps-users-management.js b/dist/settings-vue-settings-apps-users-management.js
diff --git a/dist/settings-vue-settings-apps-users-management.js.map b/dist/settings-vue-settings-apps-users-management.js.map
diff --git a/dist/user-status-modal-299.js b/dist/user-status-modal-299.js
diff --git a/dist/user-status-modal-299.js.map b/dist/user-status-modal-299.js.map
diff --git a/dist/user_status-menu.js b/dist/user_status-menu.js
diff --git a/dist/user_status-menu.js.map b/dist/user_status-menu.js.map