Skip to content

fix: addis-fixed-layoutclass only when alert banner is present #826

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
merged 1 commit into from
Feb 21, 2024
Merged

fix: addis-fixed-layoutclass only when alert banner is present #826

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
7 changes: 4 additions & 3 deletions src/lib/layout/shell.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { page } from '$app/stores';
import { log } from '$lib/stores/logs';
import { wizard } from '$lib/stores/wizard';
import { activeHeaderAlert } from '$routes/console/store';

export let isOpen = false;
export let showSideNavigation = false;
Expand Down Expand Up @@ -47,9 +48,9 @@
class:grid-with-side={showSideNavigation}
class:is-open={isOpen}
class:u-hide={$wizard.show || $log.show || $wizard.cover}
class:is-fixed-layout={$$slots.alert}>
{#if $$slots.alert}
<slot name="alert" />
class:is-fixed-layout={$activeHeaderAlert?.show}>
{#if $activeHeaderAlert?.show}
<svelte:component this={$activeHeaderAlert.component} />
{/if}
<header class="main-header u-padding-inline-end-0">
<button
Expand Down
5 changes: 0 additions & 5 deletions src/routes/console/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,6 @@
!$page.url.pathname.includes('/console/account') &&
!$page.url.pathname.includes('/console/card') &&
!$page.url.pathname.includes('/console/onboarding')}>
<svelte:fragment slot="alert">
{#if $activeHeaderAlert?.show}
<svelte:component this={$activeHeaderAlert.component} />
{/if}
</svelte:fragment>
<Header slot="header" />
<SideNavigation slot="side" bind:isOpen />
<slot />
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/organization-[organization]/+layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
if (isCloud) {
await failedInvoice.load(params.organization);

if (!get(failedInvoice)) {
if (get(failedInvoice)) {
headerAlert.add({
show: true,
component: ProjectsAtRisk,
Expand Down