This commit is contained in:
Sol Irvine 2023-08-24 01:54:31 -07:00
parent 797ca6d2e6
commit 41c05838e7
16 changed files with 25 additions and 28 deletions

View File

@ -21,7 +21,7 @@ export default function AboutNaraiDetail({ awards }: { awards: string }) {
<h1 className="text-6xl">{t('about.001.subtitle')}</h1> <h1 className="text-6xl">{t('about.001.subtitle')}</h1>
</div> </div>
<div className="max-w-screen-2x relative mx-auto"> <div className="relative mx-auto max-w-screen-2xl">
<Image <Image
src={AboutImage001} src={AboutImage001}
priority={true} priority={true}
@ -39,7 +39,7 @@ export default function AboutNaraiDetail({ awards }: { awards: string }) {
<p className="text-base leading-loose">{t('about.002.para002')}</p> <p className="text-base leading-loose">{t('about.002.para002')}</p>
</div> </div>
<div className="max-w-screen-2x relative mx-auto"> <div className="relative mx-auto max-w-screen-2xl">
<Image <Image
src={AboutImage002} src={AboutImage002}
priority={true} priority={true}

View File

@ -15,7 +15,7 @@ export default function SagyobarDetail() {
return ( return (
<div className="w-full px-6"> <div className="w-full px-6">
<div className="max-w-screen-2x relative mx-auto"> <div className="relative mx-auto max-w-screen-2xl">
<Image <Image
src={BarImage001} src={BarImage001}
priority={true} priority={true}
@ -40,7 +40,7 @@ export default function SagyobarDetail() {
</div> </div>
</div> </div>
<div className="max-w-screen-2x relative mx-auto flex flex-col space-y-24"> <div className="relative mx-auto flex max-w-screen-2xl flex-col space-y-24">
<Image <Image
src={BarImage002} src={BarImage002}
priority={true} priority={true}

View File

@ -11,7 +11,7 @@ export default function ConceptDetail() {
return ( return (
<div className="w-full px-6"> <div className="w-full px-6">
<div className="max-w-screen-2x relative mx-auto"> <div className="relative mx-auto max-w-screen-2xl">
<Image <Image
src={ConceptImage001} src={ConceptImage001}
priority={true} priority={true}
@ -46,7 +46,7 @@ export default function ConceptDetail() {
</div> </div>
<div className="flex flex-row items-start justify-end md:w-1/2"> <div className="flex flex-row items-start justify-end md:w-1/2">
<div className="pb-24"> <div className="pb-24">
<Logo className="h-30 w-48" /> <Logo className="h-32 w-48" />
</div> </div>
</div> </div>
</div> </div>

View File

@ -7,11 +7,11 @@ export default function PrivacyPolicy() {
return ( return (
<> <>
<div className="mx-auto max-w-3xl text-white"> <div className="mx-auto max-w-3xl text-white">
<div className="md:text-4x text-center font-serif text-3xl font-bold leading-tight text-white md:mb-16"> <div className="text-center font-serif text-3xl font-bold leading-tight text-white md:mb-16 md:text-4xl">
{t('privacy.title')} {t('privacy.title')}
</div> </div>
<div className="mb-24 text-lg leading-normal"> <div className="mb-24 text-lg leading-normal">
<div className="text-sb-highlight text-center">{t('privacy.lastModifiedDate')}</div> <div className="text-center">{t('privacy.lastModifiedDate')}</div>
<div className="mt-4"> <div className="mt-4">
<p>{t('privacy.pleaseRead')}</p> <p>{t('privacy.pleaseRead')}</p>
<p className="mt-4">{t('privacy.usedFor')}</p> <p className="mt-4">{t('privacy.usedFor')}</p>

View File

@ -127,7 +127,6 @@ export default function TermsOfUse() {
{t('terms.contactUs.instructions')} {t('terms.contactUs.instructions')}
<a <a
href={`mailto:${t('email-address.support')}`} href={`mailto:${t('email-address.support')}`}
className="branded-link"
aria-label={t('privacy.contactUs.ariaLabel')} aria-label={t('privacy.contactUs.ariaLabel')}
> >
{t('email-address.support')} {t('email-address.support')}

View File

@ -37,7 +37,7 @@ export default function DeleteItemButton({ item }: { item: CartItem }) {
{isPending ? ( {isPending ? (
<LoadingDots className="bg-white" /> <LoadingDots className="bg-white" />
) : ( ) : (
<XMarkIcon className="hover:text-accent-3 mx-[1px] h-4 w-4 text-white dark:text-black" /> <XMarkIcon className="mx-[1px] h-4 w-4 text-white transition-opacity duration-150 hover:opacity-60 dark:text-black" />
)} )}
</button> </button>
); );

View File

@ -67,7 +67,7 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) {
leaveFrom="translate-x-0" leaveFrom="translate-x-0"
leaveTo="translate-x-full" leaveTo="translate-x-full"
> >
<Dialog.Panel className="fixed bottom-0 right-0 top-0 flex h-full w-full flex-col border-l border-white/20 bg-dark p-6 font-sans text-white backdrop-blur-xl md:w-[390px]"> <Dialog.Panel className="fixed inset-y-0 right-0 flex h-full w-full flex-col border-l border-white/20 bg-dark p-6 font-sans text-white backdrop-blur-xl md:w-[390px]">
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<p className="text-lg font-semibold">Cart</p> <p className="text-lg font-semibold">Cart</p>
@ -83,7 +83,7 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) {
</div> </div>
) : ( ) : (
<div className="flex h-full flex-col justify-between overflow-hidden p-1"> <div className="flex h-full flex-col justify-between overflow-hidden p-1">
<ul className="flex-grow overflow-auto py-4"> <ul className="grow overflow-auto py-4">
{cart.lines.map((item, i) => { {cart.lines.map((item, i) => {
const merchandiseSearchParams = {} as MerchandiseSearchParams; const merchandiseSearchParams = {} as MerchandiseSearchParams;
@ -159,11 +159,11 @@ export default function CartModal({ cart }: { cart: Cart | undefined }) {
currencyCode={cart.cost.totalTaxAmount.currencyCode} currencyCode={cart.cost.totalTaxAmount.currencyCode}
/> />
</div> </div>
<div className="mb-3 flex items-center justify-between border-b border-white/20 pb-1 pt-1"> <div className="mb-3 flex items-center justify-between border-b border-white/20 py-1">
<p>Shipping</p> <p>Shipping</p>
<p className="text-right text-white/50">Calculated at checkout</p> <p className="text-right text-white/50">Calculated at checkout</p>
</div> </div>
<div className="mb-3 flex items-center justify-between border-b border-white/20 pb-1 pt-1"> <div className="mb-3 flex items-center justify-between border-b border-white/20 py-1">
<p>Total</p> <p>Total</p>
<Price <Price
className="text-right text-base text-white" className="text-right text-base text-white"

View File

@ -19,7 +19,7 @@ export default function OpenCart({
/> />
{quantity ? ( {quantity ? (
<div className="absolute right-[23%] top-[85%] -mr-2 -mt-2 h-5 w-5 -translate-x-1/2 -translate-y-1/2 transform font-sans text-[12px] font-medium text-white"> <div className="absolute right-[23%] top-[85%] -mr-2 -mt-2 h-5 w-5 -translate-x-1/2 -translate-y-1/2 font-sans text-[12px] font-medium text-white">
{quantity} {quantity}
</div> </div>
) : null} ) : null}

View File

@ -3,8 +3,8 @@ import Image from 'next/image';
export function GridTileImage({ export function GridTileImage({
isInteractive = true, isInteractive = true,
active, active: _active,
label, label: _label,
...props ...props
}: { }: {
isInteractive?: boolean; isInteractive?: boolean;

View File

@ -15,7 +15,7 @@ const Label = ({
return ( return (
<div className={clsx('@container/label')}> <div className={clsx('@container/label')}>
<div className="flex flex-col space-y-2"> <div className="flex flex-col space-y-2">
<h3 className="mr-4 line-clamp-2 flex-grow font-serif text-3xl tracking-wider md:text-4xl"> <h3 className="mr-4 line-clamp-2 grow font-serif text-3xl tracking-wider md:text-4xl">
{title} {title}
</h3> </h3>
<div className="font-multilingual flex flex-row items-center space-x-2 text-[17px]"> <div className="font-multilingual flex flex-row items-center space-x-2 text-[17px]">

View File

@ -13,8 +13,8 @@ import { LanguageControl, SupportedLocale } from '../navbar/language-control';
export function MenuModal({ scrolled }: { scrolled: boolean }) { export function MenuModal({ scrolled }: { scrolled: boolean }) {
const t = useTranslations('Index'); const t = useTranslations('Index');
const locale = useLocale(); const locale = useLocale();
let [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
let closeButtonRef = useRef(null); const closeButtonRef = useRef(null);
const close = () => { const close = () => {
setIsOpen(false); setIsOpen(false);

View File

@ -61,7 +61,7 @@ export default function MobileMenu({ menu }: { menu: Menu[] }) {
leaveFrom="translate-x-0" leaveFrom="translate-x-0"
leaveTo="translate-x-[-100%]" leaveTo="translate-x-[-100%]"
> >
<Dialog.Panel className="fixed bottom-0 left-0 right-0 top-0 flex h-full w-full flex-col bg-white pb-6 dark:bg-black"> <Dialog.Panel className="fixed inset-0 flex h-full w-full flex-col bg-white pb-6 dark:bg-black">
<div className="p-4"> <div className="p-4">
<button <button
className="mb-4 flex h-11 w-11 items-center justify-center rounded-md border border-neutral-200 text-black transition-colors dark:border-neutral-700 dark:text-white" className="mb-4 flex h-11 w-11 items-center justify-center rounded-md border border-neutral-200 text-black transition-colors dark:border-neutral-700 dark:text-white"

View File

@ -32,7 +32,7 @@ export default function Search() {
} }
return ( return (
<form onSubmit={onSubmit} className="w-max-[550px] relative w-full lg:w-80 xl:w-full"> <form onSubmit={onSubmit} className="relative w-full max-w-[550px] lg:w-80 xl:w-full">
<input <input
type="text" type="text"
name="search" name="search"

View File

@ -36,7 +36,7 @@ export default function NewsletterSignup() {
)} )}
placeholder={t('newsletter.placeholder')} placeholder={t('newsletter.placeholder')}
/> />
<div className="mt-3 rounded-md sm:ml-3 sm:mt-0 sm:flex-shrink-0"> <div className="mt-3 rounded-md sm:ml-3 sm:mt-0 sm:shrink-0">
<button <button
type="submit" type="submit"
className={clsx( className={clsx(

View File

@ -34,7 +34,7 @@ export default function NewsletterSignup() {
)} )}
placeholder={t('newsletter.placeholder')} placeholder={t('newsletter.placeholder')}
/> />
<div className="mt-3 rounded-md sm:ml-3 sm:mt-0 sm:flex-shrink-0"> <div className="mt-3 rounded-md sm:ml-3 sm:mt-0 sm:shrink-0">
<button <button
type="submit" type="submit"
className={clsx( className={clsx(

View File

@ -100,7 +100,7 @@ const AgeGateForm: FC<AgeGateFormProps> = ({ checkoutUrl, didCancel }) => {
leaveFrom="opacity-100 translate-y-0 sm:scale-100" leaveFrom="opacity-100 translate-y-0 sm:scale-100"
leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
> >
<div className="inline-block transform space-y-6 overflow-hidden rounded-lg bg-white px-4 pb-4 pt-5 text-left align-bottom text-dark shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg sm:p-6 sm:align-middle"> <div className="inline-block space-y-6 overflow-hidden rounded-lg bg-white px-4 pb-4 pt-5 text-left align-bottom text-dark shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg sm:p-6 sm:align-middle">
<div> <div>
<div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100 dark:bg-green-900"> <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100 dark:bg-green-900">
<CheckIcon <CheckIcon
@ -116,9 +116,7 @@ const AgeGateForm: FC<AgeGateFormProps> = ({ checkoutUrl, didCancel }) => {
{t('age-gate.title')} {t('age-gate.title')}
</Dialog.Title> </Dialog.Title>
<div className="mt-2"> <div className="mt-2">
<p className="dark:text-secondary-neutral text-sm text-white"> <p className="text-sm text-white">{t('age-gate.description')}</p>
{t('age-gate.description')}
</p>
</div> </div>
</div> </div>
</div> </div>