Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorszaimen <szaimen@e.mail.de>2022-02-22 14:41:46 +0300
committernextcloud-command <nextcloud-command@users.noreply.github.com>2022-02-22 16:27:14 +0300
commit1116529b561108985c1155c23aa719aa784b79a2 (patch)
treec27c55f61e1a63cab2aa9cca82260c26608e5b6c /apps
parenta6bc871c96d071ef54d9fd3b547df606fa9d19ca (diff)
fix all modals after vue 5.0
Signed-off-by: szaimen <szaimen@e.mail.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/dashboard/src/App.vue4
-rw-r--r--apps/files/src/views/TemplatePicker.vue2
-rw-r--r--apps/settings/src/components/UserList.vue3
-rw-r--r--apps/user_status/src/components/SetStatusModal.vue20
4 files changed, 3 insertions, 26 deletions
diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/App.vue
index 75e8e6c0108..6360a6dd99a 100644
--- 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
index ade41a5416a..283841aa612 100644
--- 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
index 0ea68fb40e6..ae06d9da62a 100644
--- 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
index c3b61db5e86..f9d10851ae3 100644
--- 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;