Skip to content

Commit 62a9fd5

Browse files
authored
Merge pull request #30454 from nextcloud/backport/30420/stable21
[stable21] improve status modal
2 parents ea96a9e + a1fc749 commit 62a9fd5

File tree

6 files changed

+26
-8
lines changed

6 files changed

+26
-8
lines changed

apps/user_status/js/user-status-menu.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/user_status/js/user-status-menu.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/user_status/js/user-status-modal.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/user_status/js/user-status-modal.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/user_status/src/components/SetStatusModal.vue

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,28 @@ export default {
237237
</script>
238238

239239
<style lang="scss" scoped>
240+
// TODO: can be removed once migrated to @nextcloud-vue >= 5.0
241+
::v-deep {
242+
.modal-wrapper {
243+
.prev, .next {
244+
display: none !important;
245+
}
246+
247+
.modal-container {
248+
max-height: 100% !important;
249+
}
250+
}
251+
252+
.modal-header .modal-title {
253+
display: none;
254+
}
255+
}
256+
240257
.set-status-modal {
241258
min-height: 200px;
242259
padding: 8px 20px 20px 20px;
243260
// Enable scrollbar for too long content, same way as in Dashboard customize
244-
max-height: 70vh;
261+
max-height: 95vh;
245262
overflow: auto;
246263
247264
&__header {

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
"extends @nextcloud/browserslist-config"
135135
],
136136
"engines": {
137-
"node": ">=10.0.0"
137+
"node": "^12.0.0",
138+
"npm": "^6.0.0"
138139
}
139140
}

0 commit comments

Comments
 (0)