crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-05-15 22:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
StephDietz 2023-07-12 10:47:43 -05:00
commit 2f7569ce41
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/grid/tile.tsx
View File

@ -45,7 +45,11 @@ export function GridTileImage({
title={labels.title} title={labels.title}
amount={labels.amount} amount={labels.amount}
currencyCode={labels.currencyCode} currencyCode={labels.currencyCode}
<<<<<<< HEAD
size={labels.isSmall ? 'small' : 'large'} size={labels.isSmall ? 'small' : 'large'}
=======
size="large"
>>>>>>> design-refresh
position={labelPosition} position={labelPosition}
/> />
) : null} ) : null}

4
components/label.tsx
View File

@ -33,12 +33,12 @@ const Label = ({
> >
<h3 <h3
data-testid="product-name" data-testid="product-name"
className="mr-6 inline pl-2 font-semibold leading-none tracking-tight" className="inline pl-2 mr-6 font-semibold leading-none tracking-tight"
> >
{title} {title}
</h3> </h3>
<Price <Price
className="flex-none rounded-full bg-blue-600 p-2 font-semibold text-white" className="flex-none p-2 font-semibold text-white bg-blue-600 rounded-full"
amount={amount} amount={amount}
currencyCode={currencyCode} currencyCode={currencyCode}
/> />

6
components/product/gallery.tsx
View File

@ -25,7 +25,7 @@ export function Gallery({ images }: { images: { src: string; altText: string }[]
<div className="relative mb-12 h-full max-h-[550px] overflow-hidden"> <div className="relative mb-12 h-full max-h-[550px] overflow-hidden">
{images[currentImage] && ( {images[currentImage] && (
<Image <Image
className="relative h-full w-full object-contain" className="relative object-contain w-full h-full"
height={600} height={600}
width={600} width={600}
alt={images[currentImage]?.altText as string} alt={images[currentImage]?.altText as string}
@ -35,7 +35,7 @@ export function Gallery({ images }: { images: { src: string; altText: string }[]
{images.length > 1 ? ( {images.length > 1 ? (
<div className="absolute bottom-[15%] flex w-full justify-center"> <div className="absolute bottom-[15%] flex w-full justify-center">
<div className="mx-auto flex h-11 items-center rounded-full border border-white bg-light/80 text-gray-500 backdrop-blur dark:border-black dark:bg-dark/80"> <div className="flex items-center mx-auto text-gray-500 border border-white rounded-full h-11 bg-light/80 backdrop-blur dark:border-black dark:bg-dark/80">
<button <button
aria-label="Previous product image" aria-label="Previous product image"
onClick={() => handleNavigate('previous')} onClick={() => handleNavigate('previous')}
@ -43,7 +43,7 @@ export function Gallery({ images }: { images: { src: string; altText: string }[]
> >
<ArrowLeftIcon className="h-5" /> <ArrowLeftIcon className="h-5" />
</button> </button>
<div className="mx-1 h-6 w-px bg-gray-500"></div> <div className="w-px h-6 mx-1 bg-gray-500"></div>
<button <button
aria-label="Next product image" aria-label="Next product image"
onClick={() => handleNavigate('next')} onClick={() => handleNavigate('next')}