Skip to content

Commit

Permalink
fix all modals after vue 5.0
Browse files Browse the repository at this point in the history
Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
  • Loading branch information
szaimen committed Feb 22, 2022
1 parent a6bc871 commit 337ebf1
Show file tree
Hide file tree
Showing 16 changed files with 35 additions and 41 deletions.
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
29 changes: 15 additions & 14 deletions apps/files/src/views/TemplatePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<Modal v-if="opened"
:clear-view-delay="-1"
class="templates-picker"
size="large"
size="normal"
@close="close">
<form class="templates-picker__form"
:style="style"
Expand All @@ -44,19 +44,19 @@
:ratio="provider.ratio"
@check="onCheck" />
</ul>

<!-- Cancel and submit -->
<div class="templates-picker__buttons">
<button @click="close">
{{ t('files', 'Cancel') }}
</button>
<input type="submit"
class="primary"
:value="t('files', 'Create')"
:aria-label="t('files', 'Create a new file with the selected template')">
</div>
</form>

<!-- Cancel and submit -->
<div class="templates-picker__buttons">
<button @click="close">
{{ t('files', 'Cancel') }}
</button>
<input type="submit"
class="primary"
:value="t('files', 'Create')"
:aria-label="t('files', 'Create a new file with the selected template')">
</div>

<EmptyContent v-if="loading" class="templates-picker__loading" icon="icon-loading">
{{ t('files', 'Creating file') }}
</EmptyContent>
Expand Down Expand Up @@ -249,6 +249,7 @@ export default {
padding: calc(var(--margin) * 2);
// Will be handled by the buttons
padding-bottom: 0;
min-height: calc(100% - 110px);

h2 {
text-align: center;
Expand All @@ -273,7 +274,7 @@ export default {
&__buttons {
display: flex;
justify-content: space-between;
padding: calc(var(--margin) * 2) var(--margin);
padding: 20px;
position: sticky;
bottom: 0;
background-image: linear-gradient(0, var(--gradient-main-background));
Expand All @@ -286,7 +287,7 @@ export default {
// Make sure we're relative for the loading emptycontent on top
::v-deep .modal-container {
position: relative;
overflow-y: auto !important;

}

&__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
4 changes: 0 additions & 4 deletions apps/user_status/src/components/SetStatusModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,7 @@ export default {
}

.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.

0 comments on commit 337ebf1

Please sign in to comment.