Merged in refactor/design-system-divider (pull request #2354)

refactor: move divider to design system

Approved-by: Arvid Norlin
This commit is contained in:
Christian Andolf
2025-06-13 09:38:10 +00:00
71 changed files with 231 additions and 244 deletions

View File

@@ -3,12 +3,12 @@ import { FormProvider, useForm } from "react-hook-form"
import { useIntl } from "react-intl"
import { Button } from "@scandic-hotels/design-system/Button"
import { Divider } from "@scandic-hotels/design-system/Divider"
import { Typography } from "@scandic-hotels/design-system/Typography"
import { trpc } from "@/lib/trpc/client"
import { useRatesStore } from "@/stores/select-rate"
import Divider from "@/components/TempDesignSystem/Divider"
import { useRoomContext } from "@/contexts/SelectRate/Room"
import useLang from "@/hooks/useLang"
@@ -75,7 +75,7 @@ export default function Form({ close }: { close: () => void }) {
<form onSubmit={methods.handleSubmit(onSubmit)}>
<Checkboxes />
<div className={styles.footer}>
<Divider color="borderDividerSubtle" className={styles.divider} />
<Divider color="Border/Divider/Subtle" className={styles.divider} />
<div className={styles.buttonContainer}>
<Typography variant="Body/Supporting text (caption)/smBold">
<Button variant="Tertiary" size="Small" type="submit">

View File

@@ -2,11 +2,11 @@
import { useSession } from "next-auth/react"
import { useIntl } from "react-intl"
import { Divider } from "@scandic-hotels/design-system/Divider"
import { Typography } from "@scandic-hotels/design-system/Typography"
import { useRatesStore } from "@/stores/select-rate"
import Divider from "@/components/TempDesignSystem/Divider"
import { useRoomContext } from "@/contexts/SelectRate/Room"
import { isValidClientSession } from "@/utils/clientSession"
@@ -66,14 +66,14 @@ export default function BreakfastMessage({
return (
<div className={styles.message}>
<Divider className={styles.divider} color="borderDividerSubtle" />
<Divider className={styles.divider} color="Border/Divider/Subtle" />
<Typography
variant={"Body/Supporting text (caption)/smRegular"}
className={styles.breakfastMessage}
>
<p>{breakfastMessage}</p>
</Typography>
<Divider className={styles.divider} color="borderDividerSubtle" />
<Divider className={styles.divider} color="Border/Divider/Subtle" />
</div>
)
}

View File

@@ -2,11 +2,12 @@
import { useSession } from "next-auth/react"
import { Divider } from "@scandic-hotels/design-system/Divider"
import { dt } from "@/lib/dt"
import { useRatesStore } from "@/stores/select-rate"
import SkeletonShimmer from "@/components/SkeletonShimmer"
import Divider from "@/components/TempDesignSystem/Divider"
import { useRoomContext } from "@/contexts/SelectRate/Room"
import { isValidClientSession } from "@/utils/clientSession"
@@ -62,7 +63,7 @@ export default function Rates({
<Code {...sharedProps} code={code} />
<Campaign {...sharedProps} campaign={campaign} />
<Redemptions {...sharedProps} redemptions={redemptions} />
{showDivider ? <Divider color="borderDividerSubtle" /> : null}
{showDivider ? <Divider color="Border/Divider/Subtle" /> : null}
{isFetchingAdditionalRate ? (
<>
<SkeletonShimmer height="100px" />