Skip to content
Merged
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
35 changes: 22 additions & 13 deletions src/components/NcAppNavigation/NcAppNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,16 @@ emit('toggle-navigation', {
role="navigation"
:class="{'app-navigation--close':!open }">
<NcAppNavigationToggle :open="open" @update:open="toggleNavigation" />
<slot />

<!-- List for Navigation li-items -->
<ul class="app-navigation__list">
<slot name="list" />
</ul>

<!-- Footer for e.g. AppNavigationSettings -->
<slot name="footer" />
<div :aria-hidden="ariaHidden" class="app-navigation__content">
<slot />
<!-- List for Navigation li-items -->
<ul class="app-navigation__list">
<slot name="list" />
</ul>

<!-- Footer for e.g. AppNavigationSettings -->
<slot name="footer" />
</div>
</div>
</template>

Expand All @@ -91,6 +92,11 @@ export default {
open: true,
}
},
computed: {
ariaHidden() {
return this.open ? 'false' : 'true'
},
},

watch: {
isMobile() {
Expand Down Expand Up @@ -156,10 +162,6 @@ export default {
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
display: flex;
flex-direction: column;
flex-grow: 0;
flex-shrink: 0;
Comment on lines -159 to -162
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs reverting it heavily breaks the talk left sidebar:
grafik

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I would have blocked if seen on time, this seems absolutely not related to this PR

Copy link
Contributor

@skjnldsv skjnldsv May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@ShGKme ShGKme May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but not all of them.

These styles are flex container styles. They should have been moved.

display: flex;
flex-direction: column;

while these are flex elements styles. They should be only here.

flex-grow: 0;
flex-shrink: 0;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems absolutely not related to this PR

50% of these styles are flex container styles. In this PR there was created a new flex container for all content, and all flex container styles were moved to the new flex container. So, they are related.

Although, another 50% were flex element styles and really not related.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, this what i feared: it is hard to test every app. Thank you @ShGKme for explanation and fixing!

background-color: var(--color-main-background-blur, var(--color-main-background));
-webkit-backdrop-filter: var(--filter-background-blur, none);
backdrop-filter: var(--filter-background-blur, none);
Expand All @@ -183,6 +185,13 @@ export default {
gap: var(--default-grid-baseline, 4px);
padding: calc(var(--default-grid-baseline, 4px) * 2);
}
&__content {
height: 100%;
display: flex;
flex-direction: column;
flex-grow: 0;
flex-shrink: 0;
Comment on lines +190 to +193
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These styles are moved from .app-navigation, which previously was the container of slots and the list, to the new container. Could we now remove them from the .app-navigation or they are still required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is hard to test all apps and the risk to break something is high. I could remove https://github.com/nextcloud/nextcloud-vue/blob/master/src/components/NcAppNavigation/NcAppNavigation.vue#L161-L162 but would like leave it to be safe.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

}
}

// add extra border for high contrast mode
Expand Down