Skip to content

fix(NcAppNavigation): small screen support #4767

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
susnux merged 1 commit into from
Nov 8, 2023
Merged

fix(NcAppNavigation): small screen support #4767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 19 additions & 8 deletions src/components/NcAppNavigation/NcAppNavigation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ emit('toggle-navigation', {
<div ref="appNavigationContainer"
class="app-navigation"
:class="{'app-navigation--close':!open }">
<NcAppNavigationToggle :open="open" @update:open="toggleNavigation" />
<div class="app-navigation__toggle-wrapper">
<NcAppNavigationToggle :open="open" @update:open="toggleNavigation" />
</div>
<nav id="app-navigation-vue"
:aria-hidden="open ? 'false' : 'true'"
:aria-label="ariaLabel || undefined"
Expand Down Expand Up @@ -206,8 +208,11 @@ export default {
// Set scoped variable override
// Using --color-text-maxcontrast as a fallback evaluates to an invalid value as it references itself in this scope instead of the variable defined higher up
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-text-maxcontrast-default));
// Left padding + toggle button + right padding from NcAppContent
--app-navigation-toggle-width: calc(var(--app-navigation-padding) + var(--default-clickable-area) + var(--default-grid-baseline));
transition: transform var(--animation-quick), margin var(--animation-quick);
width: $navigation-width;
max-width: calc(100vw - var(--app-navigation-toggle-width));
position: relative;
top: 0;
left: 0;
Expand All @@ -231,7 +236,15 @@ export default {
position: absolute;
}

//list of navigation items
&__toggle-wrapper {
position: absolute;
top: 0;
left: 100%;
// "app-navigation-padding (default-clickable-area) default-clickable-area" to fit AppContentHeader margin
width: var(--app-navigation-toggle-width);
height: calc(var(--app-navigation-padding) * 2 + var(--default-clickable-area));
}

&__content > ul,
&__list {
position: relative;
Expand Down Expand Up @@ -264,13 +277,11 @@ export default {
.app-navigation:not(.app-navigation--close) {
position: absolute;
}
}

// Put the toggle behind appsidebar on small screens
@media only screen and (max-width: 768px) {
.app-navigation {
z-index: 1400;
.app-navigation__toggle-wrapper {
background: inherit;
backdrop-filter: var(--filter-background-blur, none);
border-radius: 0 var(--border-radius-large) var(--border-radius-large) 0;
}
}

</style>
3 changes: 1 addition & 2 deletions src/components/NcAppNavigationToggle/NcAppNavigationToggle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ export default {
button.app-navigation-toggle {
position: absolute;
top: var(--app-navigation-padding);
right: calc(0px - var(--app-navigation-padding));
margin-right: - $clickable-area;
left: var(--app-navigation-padding);
}

</style>