Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix all modals after vue 5.0 #31319

Merged
merged 1 commit into from
Feb 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions apps/dashboard/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -553,9 +553,7 @@ export default {

.modal__content {
padding: 32px 16px;
max-height: 70vh;
text-align: center;
overflow: auto;

ol {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/views/TemplatePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions apps/settings/src/components/UserList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -598,7 +598,6 @@ export default {
flex-direction: column;
align-items: center;
text-align: center;
overflow: auto;
}
.modal__item {
margin-bottom: 16px;
Expand Down
20 changes: 0 additions & 20 deletions apps/user_status/src/components/SetStatusModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions dist/dashboard-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dashboard-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-users-351.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-351.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/user-status-modal-299.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/user-status-modal-299.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/user_status-menu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/user_status-menu.js.map

Large diffs are not rendered by default.