Skip to content

Commit

Permalink
Fix CTA layout bug (#3918)
Browse files Browse the repository at this point in the history
* Fix layout on CTA pages

* Fix scroll on embedded dashboards

* Revert "Fix scroll on embedded dashboards"

This reverts commit 4338eee.
  • Loading branch information
ericpgreen2 authored Jan 29, 2024
1 parent 2e5a587 commit 321215e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
14 changes: 4 additions & 10 deletions web-admin/src/routes/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,13 @@

<RillTheme>
<QueryClientProvider client={queryClient}>
<main class="flex flex-col {onDashboardPage && 'h-screen'}">
<main class="flex flex-col min-h-screen {onDashboardPage && 'h-screen'}">
{#if !isEmbed}
<TopNavigationBar />
{/if}
<div
class="flex-grow {onDashboardPage
? 'overflow-hidden'
: 'overflow-auto'}"
>
<ErrorBoundary>
<slot />
</ErrorBoundary>
</div>
<ErrorBoundary>
<slot />
</ErrorBoundary>
</main>
</QueryClientProvider>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<script lang="ts">
// Components with tall content might want h-4/5
export let height = "h-3/5";
</script>

<div class="flex flex-col justify-center items-center {height} m-auto">
<div class="flex flex-col justify-center items-center my-16 sm:my-32 md:my-64">
<slot />
</div>

1 comment on commit 321215e

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

Please sign in to comment.