Merge pull request #213 from ASAP-as-soon-as-possible/fix/buttonCommon/…

…#211 [Fix/#211] 버튼 공통컴포넌트 기존으로 복귀 및 CAT dim 따로 처리
ASAP-as-soon-as-possible · Nov 3, 2023 · ae0b6f8 · ae0b6f8
2 parents 8196c16 + 2f9a9ed
commit ae0b6f8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/components/atomComponents/Button.tsx b/src/components/atomComponents/Button.tsx
@@ -21,11 +21,11 @@ export default Button;
 const buttonDefaultCSS = {
   basicCss: css`
     display: flex;
-    position: fixed;
-    bottom: 2.9rem;
+    /* position: fixed;
+    bottom: 2.9rem; */
     align-items: center;
     justify-content: center;
-    z-index: 1;
+    /* z-index: 1; */
     border-radius: 0.8rem;
     padding: 1.6rem;
     width: 33.5rem;

diff --git a/src/pages/selectSchedule/SelectSchedulePage.tsx b/src/pages/selectSchedule/SelectSchedulePage.tsx
@@ -196,15 +196,16 @@ function SelectSchedulePage() {
         <PlusIc />
       </PlusButton>
 
-      <Button
-        typeState={isScheduleListValid ? 'primaryActive' : 'secondaryDisabled'}
-        onClick={() => {
-          isScheduleListValid && navigate(`/${auth}/priority/${meetingId}`);
-        }}
-      >
-        <Text font={'button2'}>다음</Text>
-      </Button>
-      <StyledBtnSection />
+      <StyledBtnSection>
+        <Button
+          typeState={isScheduleListValid ? 'primaryActive' : 'secondaryDisabled'}
+          onClick={() => {
+            isScheduleListValid && navigate(`/${auth}/priority/${meetingId}`);
+          }}
+        >
+          <Text font={'button2'}>다음</Text>
+        </Button>
+      </StyledBtnSection>
     </SelectPageWrapper>
   );
 }