fixup! fix: set mainContainerSelector to 'body'

Signed-off-by: Maksim Sukharev <[email protected]>
nextcloud · Sep 18, 2024 · d395921 · d395921
1 parent 7854ee9
commit d395921
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/src/FilesSidebarCallViewApp.vue b/src/FilesSidebarCallViewApp.vue
@@ -282,13 +282,6 @@ export default {
 }
 </script>
 
-<style lang="css">
-/* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
-body .modal-wrapper * {
-	box-sizing: border-box;
-}
-</style>
-
 <style lang="scss" scoped>
 @import './assets/variables';
 

diff --git a/src/FilesSidebarTabApp.vue b/src/FilesSidebarTabApp.vue
@@ -384,11 +384,22 @@ export default {
 }
 </script>
 
-<style lang="css">
-	/* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
-	body .modal-wrapper * {
+<style>
+/* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
+body .modal-wrapper * {
 	box-sizing: border-box;
-	}
+}
+
+/* FIXME: Align styles of NcModal header with NcDialog header. Remove if all are migrated */
+body .modal-wrapper h2.nc-dialog-alike-header {
+	font-size: 21px;
+	text-align: center;
+	height: fit-content;
+	min-height: var(--default-clickable-area);
+	line-height: var(--default-clickable-area);
+	overflow-wrap: break-word;
+	margin-block: 0 12px;
+}
 </style>
 
 <style scoped>

diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
@@ -251,7 +251,7 @@ export default {
 }
 </script>
 
-<style lang="css">
+<style>
 /* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
 body .modal-wrapper * {
 	box-sizing: border-box;

diff --git a/src/Recording.vue b/src/Recording.vue
@@ -54,7 +54,7 @@ export default {
 }
 </script>
 
-<style lang="css">
+<style>
 /* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
 body .modal-wrapper * {
 	box-sizing: border-box;

diff --git a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<NcDialog ref="modal"
+	<NcDialog ref="dialog"
 		:name="dialogTitle"
 		:container="container"
 		close-on-click-outside
@@ -91,7 +91,7 @@ export default {
 
 	mounted() {
 		// Postpone render of NewMessage until modal container is mounted
-		this.modalContainerId = `#modal-description-${this.$refs.modal.navigationId}`
+		this.modalContainerId = '#' + this.$refs.dialog.$el.querySelector('.modal-container')?.id
 		this.$nextTick(() => {
 			this.$refs.newMessage.focusInput()
 		})