Skip to content
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.

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

fix(NcAppNavigation): remove background square connecting toggle and navigation #4779

Merged
merged 1 commit into from
Nov 8, 2023
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
20 changes: 2 additions & 18 deletions src/components/NcAppNavigation/NcAppNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,10 @@ 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));
// Left toggle button padding + toggle button + right padding from NcAppContent
max-width: calc(100vw - (var(--app-navigation-padding) + var(--default-clickable-area) + var(--default-grid-baseline)));
position: relative;
top: 0;
left: 0;
Expand All @@ -236,15 +235,6 @@ export default {
position: absolute;
}

&__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 @@ -277,11 +267,5 @@ export default {
.app-navigation:not(.app-navigation--close) {
position: absolute;
}

.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>
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ export default {
</script>

<style scoped lang="scss">

button.app-navigation-toggle {
position: absolute;
top: var(--app-navigation-padding);
left: var(--app-navigation-padding);
right: calc(0px - var(--app-navigation-padding));
margin-right: - $clickable-area;
background-color: var(--color-main-background);
}

</style>