Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
129 changes: 112 additions & 17 deletions package-lock.json

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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@nextcloud/l10n": "^1.4.1",
"@nextcloud/moment": "^1.1.1",
"@nextcloud/router": "^1.2.0",
"@nextcloud/vue": "^2.7.0",
"@nextcloud/vue": "^3.1.0",
"@nextcloud/vue-dashboard": "^1.0.1",
"attachmediastream": "^2.1.0",
"crypto-js": "^4.0.0",
Expand Down
10 changes: 10 additions & 0 deletions src/components/RightSidebar/Participants/ParticipantsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -287,4 +287,14 @@ export default {
right: 6px !important;
}

/*
* The field will fully overlap the top of the sidebar content so
* that elements will scroll behind it
*/
.app-navigation-search {
top: -10px;
margin: -10px;
padding: 10px;
}

</style>
28 changes: 2 additions & 26 deletions src/components/RightSidebar/RightSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
:title="title"
:starred="isFavorited"
:title-editable="canModerate && isRenamingConversation"
:class="'active-tab-' + activeTab"
@update:active="handleUpdateActive"
@update:starred="onFavoriteChange"
@update:title="handleUpdateTitle"
Expand Down Expand Up @@ -112,7 +113,7 @@ export default {

data() {
return {
activeTab: null,
activeTab: 'participants',
contactsLoading: false,
// The conversation name (while editing)
conversationName: '',
Expand Down Expand Up @@ -260,31 +261,6 @@ export default {
display: flex;
}

/**
* Replace padding with margin to make the participant list scroll
* properly behind the top field
*/
#tab-participants {
margin-top: 10px;
padding-top: 0;
outline: none; /* remove the weird border that appears on focus */
}

/* Force scroll bars in tabs content instead of in whole sidebar. */
::v-deep .app-sidebar-tabs {
height: calc(100% - 80px);

&__content {
overflow: hidden;

section {
height: 100%;

overflow-y: auto;
}
}
}

.app-sidebar-tabs__content #tab-chat {
/* Remove padding to maximize the space for the chat view. */
padding: 0;
Expand Down