Merge pull request #3466 from nextcloud/dependabot/npm_and_yarn/nextc…

…loud/vue-2.6.0
nextcloud · Sep 1, 2020 · 0ee6e12 · 0ee6e12
2 parents 472e1e8 + 531a3e3
commit 0ee6e12
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 42 deletions.
diff --git 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
diff --git 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
@@ -242,4 +242,8 @@ export default {
 		background-color: var(--color-background-dark);
 	}
 }
+
+#app-content-wrapper {
+	display: flex;
+}
 </style>
diff --git 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
@@ -116,10 +116,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep #app-content #app-content-wrapper .app-content-details {
+::v-deep .app-content #app-content-wrapper .app-content-details {
 	margin: 0 auto;
 	max-width: 900px;
 	display: flex;
 	flex-direction: column;
+	flex: 1 1 100%;
+	min-width: 0;
 }
 </style>