Skip to content

Commit

Permalink
Merge branch 'malj/2828' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
millianapia committed Feb 12, 2025
2 parents 84b0ce6 + 1c2d871 commit 7ab9cbe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions web/pages/404.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ Custom404.getLayout = (page: AppProps) => {
messages={data?.intl?.messages}
>
<Grid>
<>
<div className="pt-topbar">
{/*@ts-ignore: TODO */}
<Header slugs={slugs} menuData={data?.menuData} />
{page}
<Footer footerData={data?.footerData} />
</>
</div>
</Grid>
</IntlProvider>
</>
Expand Down
5 changes: 3 additions & 2 deletions web/pages/500.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ Custom500.getLayout = (page: AppProps) => {
messages={data?.intl?.messages}
>
<Grid>
<>
<div className="pt-topbar">
{/*@ts-ignore: TODO */}
<Header slugs={slugs} menuData={data?.menuData} />
{page}
<Footer footerData={data?.footerData} />
</>
</div>
</Grid>
</IntlProvider>
</>
Expand Down

0 comments on commit 7ab9cbe

Please sign in to comment.