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.

Sign up for GitHub

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

Jump to bottom

Bump @nextcloud/vue from 1.5.0 to 2.6.0 #3466

Merged
merged 1 commit into from
Sep 1, 2020
Merged

Bump @nextcloud/vue from 1.5.0 to 2.6.0 #3466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions css/mail.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -336,7 +336,7 @@

// FIXES for core apps.scss

#app-navigation {
.app-navigation {
> ul {
> .navigation-account > li,
> .navigation-account > .folders > li,
Expand Down
92 changes: 71 additions & 21 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions src/components/MailboxMessage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,8 @@ export default {
background-color: var(--color-background-dark);
}
}

#app-content-wrapper {
display: flex;
}
</style>
4 changes: 2 additions & 2 deletions src/components/Message.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ export default {
}

#header,
#app-navigation,
.app-navigation,
#reply-composer,
#forward-button,
#mail-message-has-blocked-content,
Expand All @@ -462,7 +462,7 @@ export default {
.mail-message-attachments {
display: none !important;
}
#app-content {
.app-content {
margin-left: 0 !important;
}
.mail-message-body {
Expand Down
4 changes: 3 additions & 1 deletion src/views/Home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>