Skip to content

Commit

Permalink
Merge pull request #5355 from nextcloud-libraries/revert/5347
Browse files Browse the repository at this point in the history
fix: Revert "fix(NcAppNavigation): Wrap app navigation default slot with scrollable container"
  • Loading branch information
Pytal committed Mar 6, 2024
2 parents 04bc33f + cebe6ea commit 7bdee39
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
17 changes: 1 addition & 16 deletions src/components/NcAppNavigation/NcAppNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ emit('toggle-navigation', {
class="app-navigation__content"
:inert="!open || undefined"
@keydown.esc="handleEsc">
<div v-if="$scopedSlots.default" class="app-navigation__body">
<!-- @slot Content within the nav, do NOT add NcModal/NcDialog inside this slot -->
<slot />
</div>

<slot />
<!-- List for Navigation li-items -->
<ul v-if="$scopedSlots.list" class="app-navigation__list">
<slot name="list" />
Expand Down Expand Up @@ -259,17 +255,6 @@ export default {
position: absolute;
}
&__body {
position: relative;
height: 100%;
width: 100%;
overflow-x: hidden;
overflow-y: auto;
box-sizing: border-box;
display: flex;
flex-direction: column;
}
&__content > ul,
&__list {
position: relative;
Expand Down
8 changes: 7 additions & 1 deletion src/components/NcAppNavigationList/NcAppNavigationList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,17 @@ ul.app-navigation-list { // Increase specificity over NcAppNavigation styles
position: relative;
height: fit-content;
width: 100%;
overflow: visible;
overflow: unset;
box-sizing: border-box;
display: flex;
flex-direction: column;
gap: var(--default-grid-baseline, 4px);
padding: var(--app-navigation-padding);
&:nth-last-of-type(2) {
// Fill remaining space before NcAppNavigation footer
height: 100%;
overflow: auto;
}
}
</style>

0 comments on commit 7bdee39

Please sign in to comment.