diff --git a/src/components/MerchSection/MerchData.ts b/src/components/MerchSection/MerchData.ts index dcd65fc9..ac13157d 100644 --- a/src/components/MerchSection/MerchData.ts +++ b/src/components/MerchSection/MerchData.ts @@ -1,5 +1,5 @@ -import BlackHoodie from "../../images/merch/BlackHoodie.jpeg"; -import BlackShortSleeve from "../../images/merch/BlackShortSleeve.jpeg"; +import BasicCrewneck from "../../images/merch/BasicCrewneck.jpg"; +import BasicCrewneckWithSleevePrint from "../../images/merch/BasicCrewneckWithSleevePrint.jpg"; export type MerchComponents = { id: number; @@ -16,7 +16,7 @@ export const merchList: MerchComponents[] = [ id: 0, item: "Original Basic Crewneck", price: "$29.95 CAD", - image: BlackHoodie, + image: BasicCrewneck, description: "placeholder descripton", sizes: ["S", "M", "L", "XL"], colors: ["Black"], @@ -25,7 +25,7 @@ export const merchList: MerchComponents[] = [ id: 1, item: "Crewneck with Sleeve Print", price: "$49.99 CAD", - image: BlackShortSleeve, + image: BasicCrewneckWithSleevePrint, description: "placeholder descripton", sizes: ["S", "M", "L", "XL"], colors: ["Black"], diff --git a/src/components/MerchSection/MerchItem.styles.ts b/src/components/MerchSection/MerchItem.styles.ts index 1cad3243..fa0abdde 100644 --- a/src/components/MerchSection/MerchItem.styles.ts +++ b/src/components/MerchSection/MerchItem.styles.ts @@ -23,12 +23,11 @@ export const MerchItemIconDiv = styled.div` & > img { width: 100%; - height: 100%; + height: auto; transition: 0.4s ease-in-out; background-size: cover; background-color: white; position: relative; margin-top: 15px; - aspect-ratio: 1.5 / 2; } `; diff --git a/src/images/merch/BasicCrewneck.jpg b/src/images/merch/BasicCrewneck.jpg new file mode 100644 index 00000000..8a8995e1 Binary files /dev/null and b/src/images/merch/BasicCrewneck.jpg differ diff --git a/src/images/merch/BasicCrewneckWithSleevePrint.jpg b/src/images/merch/BasicCrewneckWithSleevePrint.jpg new file mode 100644 index 00000000..f74a983c Binary files /dev/null and b/src/images/merch/BasicCrewneckWithSleevePrint.jpg differ diff --git a/src/images/merch/BlackHoodie.jpeg b/src/images/merch/BlackHoodie.jpeg deleted file mode 100644 index 954d43d3..00000000 Binary files a/src/images/merch/BlackHoodie.jpeg and /dev/null differ diff --git a/src/images/merch/BlackShortSleeve.jpeg b/src/images/merch/BlackShortSleeve.jpeg deleted file mode 100644 index a029a383..00000000 Binary files a/src/images/merch/BlackShortSleeve.jpeg and /dev/null differ