From bf79d108356418c80cfe7a9ddc2496977ae9bb17 Mon Sep 17 00:00:00 2001 From: Christiaan Scheermeijer Date: Wed, 21 Feb 2024 11:22:25 +0100 Subject: [PATCH] fix: footer overlap fix --- .../ui-react/src/containers/Layout/Layout.module.scss | 11 +---------- packages/ui-react/src/containers/Layout/Layout.tsx | 4 ++-- .../Layout/__snapshots__/Layout.test.tsx.snap | 8 ++------ 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/packages/ui-react/src/containers/Layout/Layout.module.scss b/packages/ui-react/src/containers/Layout/Layout.module.scss index 06aac380b..75626e1ef 100644 --- a/packages/ui-react/src/containers/Layout/Layout.module.scss +++ b/packages/ui-react/src/containers/Layout/Layout.module.scss @@ -1,16 +1,6 @@ @use '@jwp/ott-ui-react/src/styles/variables'; @use '@jwp/ott-ui-react/src/styles/theme'; -.layout { - display: flex; - flex-grow: 1; - flex-direction: column; -} - -.container { - flex: 1; -} - .footer { padding: 20px 40px; line-height: 18px; @@ -63,6 +53,7 @@ div.testFixMargin { background-color: variables.$white; content: ''; } + body:global(.is-tabbing) & { &:focus { &::after { diff --git a/packages/ui-react/src/containers/Layout/Layout.tsx b/packages/ui-react/src/containers/Layout/Layout.tsx index de70e0042..231f44022 100644 --- a/packages/ui-react/src/containers/Layout/Layout.tsx +++ b/packages/ui-react/src/containers/Layout/Layout.tsx @@ -144,7 +144,7 @@ const Layout = () => { const containerProps = { inert: sideBarOpen ? '' : undefined }; // inert is not yet officially supported in react return ( -
+
{siteName} @@ -153,7 +153,7 @@ const Layout = () => { -
+
setSideBarOpen(true)} logoSrc={banner} diff --git a/packages/ui-react/src/containers/Layout/__snapshots__/Layout.test.tsx.snap b/packages/ui-react/src/containers/Layout/__snapshots__/Layout.test.tsx.snap index d13b82d60..22f3c63d6 100644 --- a/packages/ui-react/src/containers/Layout/__snapshots__/Layout.test.tsx.snap +++ b/packages/ui-react/src/containers/Layout/__snapshots__/Layout.test.tsx.snap @@ -2,12 +2,8 @@ exports[` > renders layout 1`] = `
-
-
+
+