From 283455fc796a5fd1a0835597c1bb129a98297264 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 13 Oct 2020 10:03:53 -0300 Subject: [PATCH] Layout Changes --- components/core/Layout/Layout.module.css | 7 --- components/core/Layout/Layout.tsx | 5 +- components/core/Navbar/Navbar.tsx | 68 ++++++++++++------------ components/ui/Container/Container.tsx | 2 +- pages/wishlist.tsx | 28 ++++++++++ 5 files changed, 64 insertions(+), 46 deletions(-) delete mode 100644 components/core/Layout/Layout.module.css create mode 100644 pages/wishlist.tsx diff --git a/components/core/Layout/Layout.module.css b/components/core/Layout/Layout.module.css deleted file mode 100644 index d9ee4fa63..000000000 --- a/components/core/Layout/Layout.module.css +++ /dev/null @@ -1,7 +0,0 @@ -.root { - @apply h-full bg-primary; -} - -.main { - min-height: 100vh; -} diff --git a/components/core/Layout/Layout.tsx b/components/core/Layout/Layout.tsx index 344ac3f59..ef8df08dd 100644 --- a/components/core/Layout/Layout.tsx +++ b/components/core/Layout/Layout.tsx @@ -1,6 +1,5 @@ import cn from 'classnames' import { FC } from 'react' -import s from './Layout.module.css' import { CommerceProvider } from '@lib/bigcommerce' import { Navbar, Featurebar, Footer } from '@components/core' import { Container, Sidebar } from '@components/ui' @@ -13,7 +12,7 @@ interface Props { } const CoreLayout: FC = ({ className, children }) => { - const rootClassName = cn(s.root, className) + const rootClassName = cn('h-full bg-primary', className) const { displaySidebar, closeSidebar } = useUI() return ( @@ -25,7 +24,7 @@ const CoreLayout: FC = ({ className, children }) => { -
{children}
+
{children}