diff --git a/components/product/BagelCard/BagelCard.module.css b/components/product/BagelCard/BagelCard.module.css index 0fe28bd86..b7a796918 100644 --- a/components/product/BagelCard/BagelCard.module.css +++ b/components/product/BagelCard/BagelCard.module.css @@ -3,6 +3,8 @@ bg-no-repeat bg-center bg-cover transition-transform ease-linear cursor-pointer; height: 100% !important; + display: flex; + flex-flow: row nowrap; &:hover { & .squareBg:before { @@ -18,47 +20,20 @@ & .wishlistButton { @apply bg-secondary text-secondary; } - - &:nth-child(6n + 1) .productTitle > span, - &:nth-child(6n + 1) .productPrice, - &:nth-child(6n + 1) .wishlistButton { - @apply bg-violet text-white; - } - - &:nth-child(6n + 5) .productTitle > span, - &:nth-child(6n + 5) .productPrice, - &:nth-child(6n + 5) .wishlistButton { - @apply bg-blue text-white; - } - - &:nth-child(6n + 3) .productTitle > span, - &:nth-child(6n + 3) .productPrice, - &:nth-child(6n + 3) .wishlistButton { - @apply bg-pink text-white; - } - - &:nth-child(6n + 6) .productTitle > span, - &:nth-child(6n + 6) .productPrice, - &:nth-child(6n + 6) .wishlistButton { - @apply bg-cyan text-white; - } } +} - &:nth-child(6n + 1) .squareBg { - @apply bg-violet; - } - - &:nth-child(6n + 5) .squareBg { - @apply bg-blue; - } - - &:nth-child(6n + 3) .squareBg { - @apply bg-pink; - } - - &:nth-child(6n + 6) .squareBg { - @apply bg-cyan; - } +.button { + @apply bg-gray-900 hover:bg-gray-500; + padding: 10px 30px; + color: white; + /* background: black; */ + font-weight: 600; + width: fit-content; + height: auto; + border-radius: 20px; + text-align: center; + transition: 0.3s; } .squareBg, @@ -84,50 +59,15 @@ @apply bg-accents-0 !important; background-image: url('/bg-products.svg'); } - - & .productTitle { - @apply pt-2; - font-size: 1rem; - - & span { - @apply leading-extra-loose; - } - } - - & .productPrice { - @apply text-sm; - } } -.productTitle { - @apply pt-0 max-w-full w-full leading-extra-loose; - font-size: 2rem; - letter-spacing: 0.4px; - - & span { - @apply py-4 px-6 bg-primary text-primary font-bold; - font-size: inherit; - letter-spacing: inherit; - box-decoration-break: clone; - -webkit-box-decoration-break: clone; - } -} - -.productPrice { - @apply py-4 px-6 bg-primary text-primary font-semibold inline-block text-sm leading-6; - letter-spacing: 0.4px; -} - -.wishlistButton { - @apply w-10 h-10 flex ml-auto items-center justify-center bg-primary text-primary font-semibold text-xs leading-6 cursor-pointer; -} .imageContainer { @apply flex items-center justify-center; overflow: hidden; & > div { - min-width: 100%; + min-width: 50%; } } diff --git a/components/product/BagelCard/BagelCard.tsx b/components/product/BagelCard/BagelCard.tsx index 632d65c05..83b5423a4 100644 --- a/components/product/BagelCard/BagelCard.tsx +++ b/components/product/BagelCard/BagelCard.tsx @@ -21,60 +21,34 @@ const BagelCard: FC = ({ imgProps, ...props }) => ( - - - {variant === 'slim' ? ( -
-
- - {product.name} - -
- {product?.images && ( - {product.name - )} -
- ) : ( - <> -
-
-
-

- {product.name} -

- - {product.price.value} -   - {product.price.currencyCode} - -
-
-
- {product?.images && ( - {product.name - )} -
- - )} -
- + <> +
+
+ {product?.images && ( + {product.name + )} +
+
+

+ Featuring Grainchanging Technology +

+ + Try The Better Bagel + +
+
+ ) export default BagelCard diff --git a/pages/_app.tsx b/pages/_app.tsx index 4de4040a7..707b24ece 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,4 +1,5 @@ import '@assets/main.scss' +import '../styles/globals.css' import '@assets/chrome-bug.scss' // import 'keen-slider/keen-slider.min.css' diff --git a/pages/index.tsx b/pages/index.tsx index 7d2b709bd..84fdf9c50 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,6 +1,7 @@ import { Layout } from '@components/common' import { Grid, Marquee, Hero } from '@components/ui' import { BagelCard } from '@components/product' +import { ProductCard } from '@components/product' import type { GetStaticPropsContext, InferGetStaticPropsType } from 'next' import { getConfig } from '@framework/api' @@ -8,6 +9,8 @@ import getAllProducts from '@framework/product/get-all-products' import getSiteInfo from '@framework/common/get-site-info' import getAllPages from '@framework/common/get-all-pages' +import styles from '../styles/Home.module.scss' + export async function getStaticProps({ preview, locale, @@ -41,37 +44,23 @@ export default function Home({ }: InferGetStaticPropsType) { return ( <> - - {/* main product */} - {products.slice(0, 3).map((product, i) => ( - - ))} - - {/* Featured In */} - {/* Banana Comparison */} - {/* */} - {/* */} - - {/* instagram */} - {products.slice(0, 3).map((product, i) => ( - - ))} - +
+
+
+
+ +
+
+

+ Featuring Grainchanging Technology +

+ +
+
+
+
) } diff --git a/styles/Home.module.scss b/styles/Home.module.scss index 563abc1da..2d46da558 100644 --- a/styles/Home.module.scss +++ b/styles/Home.module.scss @@ -12,21 +12,22 @@ } .main { - padding: 5rem 0; margin: 2em; + width: 100%; flex: 1; display: flex; flex-direction: column; - justify-content: center; + justify-content: flex-start; align-items: center; div { display: flex; } } -.grid { +.row { flex-flow: row nowrap; - margin: 2em; + margin: 0 2em; + width: 100%; div { width: 50%; margin: 2em; diff --git a/styles/globals.css b/styles/globals.css index 55bb2323b..289ca443a 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -17,7 +17,9 @@ a { h1 { margin: 0; + font-size: 42px; font-weight: 400; + line-height: 44px; } h2 { @@ -32,18 +34,24 @@ h3 { h4 { margin: 0; + font-size: 20px; + font-weight: 700; } h5 { margin: 0; + font-size: 16px; + font-weight: 700; } h6 { margin: 0; + font-size: 12px; + font-weight: 700; } -btn { - padding: 10px 30px; +button { + padding: 10px 36px; color: white; background: black; width: fit-content; @@ -53,6 +61,6 @@ btn { transition: 0.3s; } -btn:hover { +button:hover { background: rgb(78, 78, 78); } \ No newline at end of file