Skip to content

Commit

Permalink
Merge pull request #804 from openSUSE/remove-slot-leftover
Browse files Browse the repository at this point in the history
[web] Remove layout slot no longer needed
  • Loading branch information
dgdavid authored Oct 20, 2023
2 parents 09edb51 + 3a0d2f8 commit 5b39692
Showing 1 changed file with 26 additions and 33 deletions.
59 changes: 26 additions & 33 deletions web/src/components/layout/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const HeaderActions = createTeleporter();
const HeaderIcon = createTeleporter();
const FooterActions = createTeleporter();
const FooterInfoArea = createTeleporter();
const Sidebar = createTeleporter();

/**
*
Expand Down Expand Up @@ -65,35 +64,32 @@ const Sidebar = createTeleporter();
*/
function Layout({ children }) {
return (
<>
<Sidebar.Target as="div" />
<div id="agama-main-wrapper" className="wrapper shadow">
<header className="split justify-between bottom-shadow">
<h1 className="split">
<HeaderIcon.Target as="span" />
<PageTitle.Target as="span" />
</h1>

<div className="split">
<PageActions.Target as="div" />
<HeaderActions.Target as="div" />
</div>

</header>

<main className="stack">
{children}
</main>

<footer className="split justify-between top-shadow" data-state="reversed">
<FooterActions.Target
role="navigation"
aria-label="Installer Actions"
/>
<img src={logoUrl} alt="Logo of SUSE" />
</footer>
</div>
</>
<div id="agama-main-wrapper" className="wrapper shadow">
<header className="split justify-between bottom-shadow">
<h1 className="split">
<HeaderIcon.Target as="span" />
<PageTitle.Target as="span" />
</h1>

<div className="split">
<PageActions.Target as="div" />
<HeaderActions.Target as="div" />
</div>

</header>

<main className="stack">
{children}
</main>

<footer className="split justify-between top-shadow" data-state="reversed">
<FooterActions.Target
role="navigation"
aria-label="Installer Actions"
/>
<img src={logoUrl} alt="Logo of SUSE" />
</footer>
</div>
);
}

Expand Down Expand Up @@ -171,8 +167,6 @@ const MainActions = FooterActions.Source;
*/
const AdditionalInfo = FooterInfoArea.Source;

const SidebarArea = Sidebar.Source;

export {
Layout as default,
Title,
Expand All @@ -181,5 +175,4 @@ export {
PageOptions,
MainActions,
AdditionalInfo,
SidebarArea
};

0 comments on commit 5b39692

Please sign in to comment.