Skip to content

✨ Update to @nextcloud/vue 7 #7846

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

Merged
nickvergessen merged 6 commits into from
Sep 1, 2022
Merged

✨ Update to @nextcloud/vue 7 #7846

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbddf90
✨Update to @nextcloud/vue 7
nickvergessen Sep 1, 2022
55a94d1
Fix page height story
nickvergessen Sep 1, 2022
7ef2bba
Fix black corners on "Search conversation" form
nickvergessen Sep 1, 2022
0ee1123
Prevent server non-vue css from kicking in
nickvergessen Sep 1, 2022
3daf544
Fix scroll height in conversation creation
nickvergessen Sep 1, 2022
fafdc42
Make the input very round
nickvergessen Sep 1, 2022
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
28 changes: 19 additions & 9 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 @@ -28,7 +28,7 @@
"@nextcloud/moment": "^1.2.1",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^6.0.0-beta.5",
"@nextcloud/vue": "^7.0.0-beta.0",
"@nextcloud/vue-dashboard": "^2.0.1",
"@nextcloud/vue-richtext": "^2.0.0",
"attachmediastream": "^2.1.0",
Expand Down
22 changes: 1 addition & 21 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,14 +498,6 @@ export default {
</script>

<style lang="scss">
body {
overflow: hidden;

/** override toastify position due to top bar */
&.has-topbar .toastify-top {
margin-top: 105px;
}
}

/* FIXME: remove after https://github.com/nextcloud/nextcloud-vue/issues/2097 is solved */
.mx-datepicker-main.mx-datepicker-popup {
Expand All @@ -515,16 +507,8 @@ body {
</style>

<style lang="scss" scoped>
.content {
height: 100%;

//FIXME: remove this v-deep once nextcloud vue v4 is adopted
::v-deep .app-navigation-toggle {
top: 8px;
right: -8px;
border-radius: var(--border-radius-pill);
}

.content {
&.in-call {
&:hover ::v-deep .app-navigation-toggle {
background-color: rgba(0, 0, 0, .1) !important;
Expand Down Expand Up @@ -554,8 +538,4 @@ body {
}
}

.app-content {
min-width: 0;
flex: 1 1 100%;
}
</style>
7 changes: 6 additions & 1 deletion src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,12 @@ export default {
justify-content: space-between;
position: relative;
&__content {
height: calc(100% - 50px);
/**
* Top: 30px line height header + 12px margin
* Bottom: 44px buttons + 12 px margin
* Total: 98px
*/
height: calc(100% - 98px);
display: flex;
flex-direction: column;
gap: 0.5rem;
Expand Down
18 changes: 1 addition & 17 deletions src/components/LeftSidebar/SearchBox/SearchBox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
-->

<template>
<form class="app-navigation-search"
@submit.prevent="handleSubmit">
<form @submit.prevent="handleSubmit">
<NcTextField ref="searchConversations"
:value.sync="localValue"
:placeholder="placeholderText"
Expand Down Expand Up @@ -126,18 +125,3 @@ export default {
},
}
</script>

<style lang="scss" scoped>
@import '../../../assets/variables';

.app-navigation-search {
position: sticky;
top: 0;
background-color: var(--color-main-background);
z-index: 1;
display: flex;
justify-content: center;
flex-grow: 1;
}

</style>
1 change: 0 additions & 1 deletion src/components/RightSidebar/RightSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

<template>
<NcAppSidebar v-show="opened"
id="app-sidebar"
:title="title"
:title-tooltip="title"
:starred="isFavorited"
Expand Down