From 531a3e3478e7209bc1db4bf58b060e59b8883d64 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 09:11:36 +0000 Subject: [PATCH] Bump @nextcloud/vue from 1.5.0 to 2.6.0 Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 1.5.0 to 2.6.0. - [Release notes](https://github.com/nextcloud/nextcloud-vue/releases) - [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v1.5.0...v2.6.0) Signed-off-by: dependabot-preview[bot] --- css/mail.scss | 34 ++++++------ package-lock.json | 92 ++++++++++++++++++++++++------- package.json | 2 +- src/components/MailboxMessage.vue | 4 ++ src/components/Message.vue | 4 +- src/views/Home.vue | 4 +- 6 files changed, 98 insertions(+), 42 deletions(-) diff --git a/css/mail.scss b/css/mail.scss index be49fe5393..529039edb1 100755 --- a/css/mail.scss +++ b/css/mail.scss @@ -100,30 +100,30 @@ /* app navigation */ /* do not display empty folders in the sidebar */ -#app-navigation .empty { +.app-navigation .empty { display: none; } -#app-navigation .navigation-account:not(:first-child) { +.app-navigation .navigation-account:not(:first-child) { margin-top: 22px; } /* do not overlap collapse icon with special use icon */ -#app-navigation .special-inbox .collapse, -#app-navigation .special-drafts .collapse, -#app-navigation .special-sent .collapse, -#app-navigation .special-trash .collapse { +.app-navigation .special-inbox .collapse, +.app-navigation .special-drafts .collapse, +.app-navigation .special-sent .collapse, +.app-navigation .special-trash .collapse { display: none !important; } -#app-navigation .special-inbox:hover .collapse, -#app-navigation .special-inbox:focus .collapse, -#app-navigation .special-drafts:hover .collapse, -#app-navigation .special-drafts:focus .collapse, -#app-navigation .special-sent:hover .collapse, -#app-navigation .special-sent:focus .collapse, -#app-navigation .special-trash:hover .collapse, -#app-navigation .special-trash:focus .collapse { +.app-navigation .special-inbox:hover .collapse, +.app-navigation .special-inbox:focus .collapse, +.app-navigation .special-drafts:hover .collapse, +.app-navigation .special-drafts:focus .collapse, +.app-navigation .special-sent:hover .collapse, +.app-navigation .special-sent:focus .collapse, +.app-navigation .special-trash:hover .collapse, +.app-navigation .special-trash:focus .collapse { display: inline-block !important; } @@ -208,12 +208,12 @@ background: radial-gradient(ellipse at top, var(--color-main-background),rgba(255,255,255,0) 70%); } -#app-navigation .msg.success { +.app-navigation .msg.success { color: #fff; background-color: var(--color-success); padding: 3px; } -#app-navigation .msg.error { +.app-navigation .msg.error { color: #fff; background-color: var(--color-error); padding: 3px; @@ -336,7 +336,7 @@ // FIXES for core apps.scss -#app-navigation { +.app-navigation { > ul { > .navigation-account > li, > .navigation-account > .folders > li, diff --git a/package-lock.json b/package-lock.json index 6908cc1de1..5cd1d6b68a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1553,6 +1553,15 @@ "integrity": "sha512-f+sKpdLZXkODV+OY39K1M+Spmd4RgxmtEXmNn4Bviv4R7uBFHXuw+JX9ZdfDeOryfHjJ/TRQxQEp0GMpBwZFUw==", "dev": true }, + "@nextcloud/capabilities": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.2.tgz", + "integrity": "sha512-HR5vnT2GKTvoQla/WdP+V0/MD1eAGUNWCM0QXVGXQ0TCHb0AORYYMdEQafROsjNSH2kriArFnS/l3YZQrUa9yA==", + "requires": { + "@nextcloud/initial-state": "^1.1.2", + "core-js": "^3.6.4" + } + }, "@nextcloud/dialogs": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-1.4.0.tgz", @@ -1693,26 +1702,67 @@ } }, "@nextcloud/vue": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-1.5.0.tgz", - "integrity": "sha512-z0KZP0PcWyHsD5zpzBJRusToGzC/1DTjapuDMrSAOSuA5lThg/Td7brmIQSwWTrw66OrL5MIRK+8HoKMWmQPAA==", - "requires": { - "@nextcloud/axios": "^1.1.0", - "@nextcloud/l10n": "^1.1.0", - "@nextcloud/router": "^1.0.0", - "core-js": "^3.4.4", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.6.0.tgz", + "integrity": "sha512-SzPXwxtbbc4BIUl4BhC7+8kDzgXG+Adr9W7x+hQdr/TuOhunVwcXOKGhyZgWew17oOCsd2c2ltrojhUiCmWjjg==", + "requires": { + "@nextcloud/auth": "^1.2.3", + "@nextcloud/axios": "^1.3.2", + "@nextcloud/capabilities": "^1.0.2", + "@nextcloud/dialogs": "^1.4.0", + "@nextcloud/event-bus": "^1.1.4", + "@nextcloud/l10n": "^1.2.3", + "@nextcloud/router": "^1.0.2", + "core-js": "^3.6.5", "debounce": "1.2.0", - "escape-html": "^1.0.3", + "emoji-mart-vue-fast": "^7.0.4", "hammerjs": "^2.0.8", + "linkifyjs": "~2.1.9", "md5": "^2.2.1", - "regenerator-runtime": "^0.13.3", - "v-click-outside": "^3.0.0", - "v-tooltip": "^2.0.0-rc.33", - "vue": "^2.6.7", - "vue-color": "^2.7.0", - "vue-multiselect": "^2.1.3", + "regenerator-runtime": "^0.13.5", + "v-click-outside": "^3.0.1", + "v-tooltip": "^2.0.3", + "vue": "^2.6.11", + "vue-color": "^2.7.1", + "vue-multiselect": "^2.1.6", "vue-visible": "^1.0.2", - "vue2-datepicker": "^3.3.1" + "vue2-datepicker": "^3.6.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz", + "integrity": "sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==", + "requires": { + "regenerator-runtime": "^0.12.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", + "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + } + } + }, + "emoji-mart-vue-fast": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-7.0.4.tgz", + "integrity": "sha512-VZuyclCe7ZNPhSvt7WT258MscqRBZTB2Is/7vBilCXgpiZqByaA4AhM1xdIIZZik/aA+5BQiZVmbsDK0jk78Eg==", + "requires": { + "@babel/polyfill": "7.2.5", + "@babel/runtime": "7.3.4", + "vue-virtual-scroller": "^1.0.0-rc.2" + } + }, + "vue2-datepicker": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.6.2.tgz", + "integrity": "sha512-J2fCwUmCxIOPUvwQ12e8evFY9cCv6vJmgxRD9fGeUv6JeMMeLwkdpeQZOcqbMf/4mk1cSrY2/9Fr8DaB30LBpA==", + "requires": { + "date-fns": "^2.0.1", + "date-format-parse": "^0.2.5" + } + } } }, "@nextcloud/vue-dashboard": { @@ -4916,11 +4966,6 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz", "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==" }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" - }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -7302,6 +7347,11 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, + "linkifyjs": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.9.tgz", + "integrity": "sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==" + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", diff --git a/package.json b/package.json index 668d8c115a..cd73e18f02 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@nextcloud/logger": "^1.1.2", "@nextcloud/moment": "^1.1.1", "@nextcloud/router": "^1.2.0", - "@nextcloud/vue": "^1.5.0", + "@nextcloud/vue": "^2.6.0", "@nextcloud/vue-dashboard": "^0.1.3", "@vue/babel-preset-app": "^4.5.4", "color-convert": "^2.0.1", diff --git a/src/components/MailboxMessage.vue b/src/components/MailboxMessage.vue index a45c8b6fc9..af4aa7b021 100644 --- a/src/components/MailboxMessage.vue +++ b/src/components/MailboxMessage.vue @@ -242,4 +242,8 @@ export default { background-color: var(--color-background-dark); } } + +#app-content-wrapper { + display: flex; +} diff --git a/src/components/Message.vue b/src/components/Message.vue index 0c34639e83..86b5aa11c8 100644 --- a/src/components/Message.vue +++ b/src/components/Message.vue @@ -453,7 +453,7 @@ export default { } #header, - #app-navigation, + .app-navigation, #reply-composer, #forward-button, #mail-message-has-blocked-content, @@ -462,7 +462,7 @@ export default { .mail-message-attachments { display: none !important; } - #app-content { + .app-content { margin-left: 0 !important; } .mail-message-body { diff --git a/src/views/Home.vue b/src/views/Home.vue index 37292b331d..acc2d39214 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -116,10 +116,12 @@ export default {