diff --git a/assets/global.css b/assets/global.css index bde37971d..4d3d23402 100644 --- a/assets/global.css +++ b/assets/global.css @@ -59,7 +59,7 @@ } .fit { - min-height: calc(100vh - 300px); + min-height: calc(100vh - 88px - 41px); } *, diff --git a/components/core/Footer/Footer.tsx b/components/core/Footer/Footer.tsx index bf31d6128..55f855429 100644 --- a/components/core/Footer/Footer.tsx +++ b/components/core/Footer/Footer.tsx @@ -22,10 +22,6 @@ const Footer: FC = ({ className, pages }) => { return (
-
-
+
-
+
@@ -47,7 +47,8 @@ const Navbar: FC = ({ className }) => {
-
+ +
diff --git a/components/product/ProductSlider/ProductSlider.module.css b/components/product/ProductSlider/ProductSlider.module.css index 299ff893f..5f076af16 100644 --- a/components/product/ProductSlider/ProductSlider.module.css +++ b/components/product/ProductSlider/ProductSlider.module.css @@ -1,9 +1,14 @@ .root { @apply relative w-full h-full; + overflow-y: hidden; + + & > div { + overflow: visible !important; + } } .rootPanel { - @apply absolute flex flex-row inset-0 z-20 overflow-hidden; + @apply absolute flex flex-row inset-0 z-20 m-20; } .leftPanel { diff --git a/components/product/ProductSlider/ProductSlider.tsx b/components/product/ProductSlider/ProductSlider.tsx index 9f9bf7666..77610e8c1 100644 --- a/components/product/ProductSlider/ProductSlider.tsx +++ b/components/product/ProductSlider/ProductSlider.tsx @@ -19,13 +19,18 @@ const ProductSlider: FC = ({ children }) => { return (
+ + {children} +
- - {children} -
) } diff --git a/components/product/ProductView/ProductView.module.css b/components/product/ProductView/ProductView.module.css index 9637d1e82..e86769c44 100644 --- a/components/product/ProductView/ProductView.module.css +++ b/components/product/ProductView/ProductView.module.css @@ -1,30 +1,40 @@ .root { - @apply relative grid items-start my-12 gap-8 grid-cols-1; + @apply relative grid items-start gap-8 grid-cols-1; - @screen md { - @apply grid-cols-12; + @screen lg { + @apply grid-cols-12 pt-10; } } -.button { - min-width: 300px; - text-align: center; -} - .productDisplay { - @apply flex px-0 pb-0 relative box-border min-h-full col-span-7; + @apply relative flex px-0 pb-0 relative box-border col-span-7; margin-right: -2rem; margin-left: -2rem; - min-height: 400px; @screen md { - @apply px-24 mx-0; + min-height: 700px; + } + + @screen lg { + @apply mx-0; + min-height: 100%; + height: 100%; + } +} + +.squareBg { + @apply absolute inset-0 bg-violet z-0; + max-height: 250px; + + @screen md { + @apply inset-20; + max-height: 500px; } } .nameBox { - @apply absolute top-0 left-0 z-50; + @apply absolute top-6 left-0 z-50; & .name { @apply px-6 py-2 bg-primary text-primary font-bold text-3xl; @@ -42,33 +52,38 @@ } } -.squareBg { - @apply absolute inset-0 bg-violet z-0; - max-height: 250px; - - @screen md { - @apply inset-14; - min-height: 100%; - } -} - .sidebar { - @apply flex flex-col md:pt-24 col-span-5; + @apply flex flex-col col-span-5; + + @screen lg { + padding-top: 5rem; + } } .sliderContainer { - @apply absolute z-10 inset-0 flex items-center justify-center; - - @screen lg { - @apply -m-12; - } + @apply absolute z-10 inset-0 flex items-center justify-center overflow-x-hidden; } .img { - @apply w-full object-cover; + @apply w-full h-full object-cover; + + @screen md { + height: 100%; + margin-top: -2.75rem; + } + + @screen lg { + height: 150%; + margin-top: -10%; + } @screen xl { - margin-top: -14%; - height: 140%; + height: 170%; + margin-top: -19%; } } + +.button { + min-width: 300px; + text-align: center; +} diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx index 909352804..91747cd92 100644 --- a/components/product/ProductView/ProductView.tsx +++ b/components/product/ProductView/ProductView.tsx @@ -65,7 +65,7 @@ const ProductView: FC = ({ product, className }) => { }} />
-
+

{product.name}

diff --git a/components/ui/Sidebar/Sidebar.tsx b/components/ui/Sidebar/Sidebar.tsx index 3a73e2587..a104ae42d 100644 --- a/components/ui/Sidebar/Sidebar.tsx +++ b/components/ui/Sidebar/Sidebar.tsx @@ -52,7 +52,7 @@ const Sidebar: FC = ({ className, children, show = true, close }) => { leaveTo="opacity-0" >
diff --git a/pages/_app.tsx b/pages/_app.tsx index 8b95bcf40..f6c1ffcd8 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,7 +1,10 @@ import '@assets/global.css' import '@assets/tailwind.css' import '@assets/utils.css' + +// To be removed import 'animate.css' + import { FC } from 'react' import type { AppProps } from 'next/app' diff --git a/tailwind.config.js b/tailwind.config.js index 5d4be29af..03b3c7f7b 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,11 +3,7 @@ module.exports = { removeDeprecatedGapUtilities: true, purgeLayersByDefault: true, }, - purge: [ - './components/**/*.{js,ts,jsx,tsx}', - './pages/**/*.{js,ts,jsx,tsx}', - './ui/**/*.{js,ts,jsx,tsx}', - ], + purge: ['./components/**/*.{js,ts,jsx,tsx}', './pages/**/*.{js,ts,jsx,tsx}'], theme: { extend: { backgroundOpacity: {