chore: Merge branch 'main' into cypress-e2e/#108

Myongji-Graduate · May 29, 2024 · 3494c2c · 3494c2c
2 parents c9bc0ca + e55c912
commit 3494c2c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/app/ui/result/result-category-card/result-category-card.skeleton.tsx b/app/ui/result/result-category-card/result-category-card.skeleton.tsx
@@ -8,9 +8,7 @@ import Skeleton from '../../../utils/skeleton';
 
 function ResultCategoryCardSkeleton() {
   return (
-    <div
-      className={cn('flex flex-col gap-6 zIndex-1 rounded-xl shadow-lg bg-white p-[0.4rem]', 'md:w-80 md:p-[1.8rem]')}
-    >
+    <div className={cn('flex flex-col gap-6 z-1 rounded-xl shadow-lg bg-white p-[0.4rem]', 'md:w-80 md:p-[1.8rem]')}>
       <div className="flex justify-between items-center">
         <div className={cn('flex gap-4 font-bold text-sm', 'md:text-xl')}>
           <Image src={Book} width={24} height={24} alt="category-img" />

diff --git a/app/ui/result/result-category-card/result-category-card.tsx b/app/ui/result/result-category-card/result-category-card.tsx
@@ -74,7 +74,7 @@ function ResultCategoryCard({ category, totalCredit, takenCredit }: ResultCatego
   return (
     <div
       className={cn(
-        'flex flex-col gap-6 zIndex-1 rounded-xl shadow-md bg-white p-4 m-auto w-full',
+        'flex flex-col gap-6 z-1 rounded-xl shadow-md bg-white p-4 m-auto w-full',
         'md:p-[1.8rem] max-w-80',
       )}
     >

diff --git a/app/ui/result/result-category-detail-content/result-category-detail-content.tsx b/app/ui/result/result-category-detail-content/result-category-detail-content.tsx
@@ -27,7 +27,7 @@ function ResultCategoryDetailContent({ info }: ResultCategoryDetailContentProps)
                 checked={isTakenLecture}
                 data-testid="lecture-toggle"
                 onCheckedChange={setIsTakenLectrue}
-                className="absolute zIndex-2"
+                className="absolute z-2"
               />
             </div>
             <span>과목이 표시됩니다.</span>

diff --git a/app/ui/result/result-category-detail-lecture/result-category-detail-lecture-toggle.tsx b/app/ui/result/result-category-detail-lecture/result-category-detail-lecture-toggle.tsx
@@ -17,7 +17,7 @@ const ResultCategoryDetailLectureToggle = React.forwardRef<
     {...props}
     ref={ref}
   >
-    <div className={cn('zIndex-1 absolute text-white text-base', props.checked ? 'left-1' : 'right-1')}>
+    <div className={cn('z-1 absolute text-white text-base', props.checked ? 'left-1' : 'right-1')}>
       {props.checked ? '기이수' : '미이수'}
     </div>
     <SwitchPrimitives.Thumb

diff --git a/app/ui/user/user-credit-result/user-credit-result.tsx b/app/ui/user/user-credit-result/user-credit-result.tsx
@@ -12,7 +12,7 @@ export default async function UserCreditResult() {
       <div className="relative sm:h-20 sm:w-20 h-14 w-14">
         <Image src={pencil} alt="pencil" layout="fill" />
       </div>
-      <p className="zIndex-1 text-sm md:text-base lg:text-lg">
+      <p className="z-1 text-sm md:text-base lg:text-lg">
         {userInfo.studentName}님, 총 기준학점 중 <span className="text-point-blue">{userInfo.takenCredit}</span>학점을
         수강하셨습니다!
       </p>

diff --git a/app/ui/view/atom/content-container/content-container.tsx b/app/ui/view/atom/content-container/content-container.tsx
@@ -10,7 +10,7 @@ export default function ContentContainer({ children, size = 'md', className }: C
   return (
     <div
       className={twMerge(
-        'absolute bg-white top-[7rem] zIndex-1 rounded-xl shadow-lg max-md:w-full',
+        'absolute bg-white top-[7rem] z-1 rounded-xl shadow-lg max-md:w-full',
         size === 'md' ? 'md:w-[70%]' : 'md:w-[80%]',
         className,
       )}

diff --git a/app/ui/view/molecule/announce-message-box/announce-massage-box.tsx b/app/ui/view/molecule/announce-message-box/announce-massage-box.tsx
@@ -26,7 +26,7 @@ function AnnounceMessageBox({ message }: AnnounceMessageBoxProp) {
           height={36}
           alt="category-fullfill-image"
         />
-        <p className={cn('zIndex-1 text-sm', 'md:text-lg')}>{message}</p>
+        <p className={cn('z-1 text-sm', 'md:text-lg')}>{message}</p>
       </div>
     </div>
   );