diff options
author | Vincent Petry <vincent@nextcloud.com> | 2020-10-29 11:22:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-29 11:22:09 +0300 |
commit | 05b3d39308aceb0b2537d886ac1c3ef1af33b767 (patch) | |
tree | 4a2db0ddfb74364dab49383c7f11e9d90e90fb89 /src | |
parent | fdf1c3cce10684df1b45be2a63e30611af7891ca (diff) | |
parent | 4c7b6a0c59e1c3965a7c2cbd401b97eeec1bd90b (diff) |
Merge pull request #4473 from nextcloud/update-nextcloud-vue-3.1.0
Bump @nextcloud/vue to 3.1.0
Diffstat (limited to 'src')
-rw-r--r-- | src/components/RightSidebar/Participants/ParticipantsTab.vue | 10 | ||||
-rw-r--r-- | src/components/RightSidebar/RightSidebar.vue | 28 |
2 files changed, 12 insertions, 26 deletions
diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue index aed041742..7dd8e98bc 100644 --- a/src/components/RightSidebar/Participants/ParticipantsTab.vue +++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue @@ -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> diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue index 6f760bfb2..1b06820a6 100644 --- a/src/components/RightSidebar/RightSidebar.vue +++ b/src/components/RightSidebar/RightSidebar.vue @@ -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" @@ -112,7 +113,7 @@ export default { data() { return { - activeTab: null, + activeTab: 'participants', contactsLoading: false, // The conversation name (while editing) conversationName: '', @@ -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; |