Merge branch 'main' into feat/api

Central-MakeUs · Feb 11, 2025 · ea3321c · ea3321c
2 parents d9361ee + ed640d4
commit ea3321c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/packages/design-system/SingleSlider.tsx b/packages/design-system/SingleSlider.tsx
@@ -24,9 +24,8 @@ export const SingleSlider = (
         className,
       )}
     >
-      <Box className=" shadow-[inset_0_0_0_3px_rgba(252,255,232,0.2)] rounded-full w-full h-[24px] bg-gradient-to-r from-main2-gradient-from via-main2-gradient-via to-main2-gradient-to" />
-      <SliderPrimitive.Track>
-        <SliderPrimitive.Range />
+      <SliderPrimitive.Track className="bg-gray-200 relative rounded-full w-full h-[24px]">
+        <SliderPrimitive.Range className="absolute bg-gradient-to-r from-main2-gradient-from via-main2-gradient-via to-main2-gradient-to rounded-full h-full" />
       </SliderPrimitive.Track>
       <SliderPrimitive.Thumb className=" duration-300 transition-transform active:scale-105 flex justify-center items-center focus:outline-none size-[48px] rounded-full bg-pastel-red bg-gradient-to-tl from-green to-yellow-green">
         <Box className=" size-[40px] rounded-full bg-green flex justify-center items-center">

diff --git a/src/entities/record/components/ProgressStep/BookRecordWriteProgressStep.tsx b/src/entities/record/components/ProgressStep/BookRecordWriteProgressStep.tsx
@@ -73,7 +73,7 @@ const ImageSection = memo((props: { status: "0" | "50" | "100"; value: number })
     <Stack className=" min-h-[400px] w-full justify-center items-center">
       <ImageFadeAnimator
         value={props.status}
-        className=" px-[100px] relative"
+        className=" px-[115px] relative"
         caseBy={{
           "0": (
             <ImageFadeAnimator.FadeIn

diff --git a/src/entities/record/components/TextStep/BookRecordWriteTextStep.tsx b/src/entities/record/components/TextStep/BookRecordWriteTextStep.tsx
@@ -56,7 +56,7 @@ export default function BookRecordWriteTextStep(
           <WarningText />
         </Flex>
 
-        <FixedBottom className=" max-h-[229px] bg-white-yellow p-4">
+        <FixedBottom className=" max-h-[229px] bg-white-yellow p-4 pb-[37px]">
           <Flex className=" flex-grow min-h-[168px] gap-[11px]">
             <Box className=" w-full">
               <TextArea.Layout>

diff --git a/src/shared/constants/externalLink.ts b/src/shared/constants/externalLink.ts
@@ -1,5 +1,5 @@
 export const SETTINGS_LINKS = {
-  FAQ: "https://burly-jar-165.notion.site/18828ba3580d80f8b23ef2a7082f8412?pvs=4",
-  TERMSANDPRIVACY: "https://burly-jar-165.notion.site/use-policy?pvs=4",
-  NOTICE: "https://burly-jar-165.notion.site/announcement?pvs=4",
+  FAQ: "http://mercuryplanet.notion.site",
+  TERMSANDPRIVACY: "https://mercuryplanet.notion.site/use-policy",
+  NOTICE: "https://mercuryplanet.notion.site/announcement",
 };