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

fix all modals after vue 5.0
pull/31377/head
Simon L 2022-02-23 15:28:58 +07:00 committed by GitHub
commit 9630d6571c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 21 additions and 44 deletions

@ -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;

@ -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 {

@ -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;

@ -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;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long