Merge pull request #550 from sopt-makers/develop

프로덕션 배포
sopt-makers · Oct 2, 2023 · 1ef6a76 · 1ef6a76
2 parents d5bb6ed + 091b781
commit 1ef6a76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/components/modal/ImageCarouselModal.tsx b/src/components/modal/ImageCarouselModal.tsx
@@ -67,7 +67,7 @@ const ModalWrapper = styled(Box, {
   zIndex: '$2',
   backgroundColor: '#181818',
   width: '100%',
-  height: '100vh',
+  height: '100%',
 });
 const Container = styled('div', {
   position: 'relative',
@@ -109,7 +109,7 @@ const CarouselContainer = styled('div', {
 const CarouselScrollContainer = styled('div', {
   display: 'flex',
   maxWidth: '1280px',
-  height: '100vh',
+  height: '100%',
   maxHeight: '600px',
 });
 const CarouselItem = styled('div', {

diff --git a/src/components/page/meetingManagement/ManagementListItem.tsx b/src/components/page/meetingManagement/ManagementListItem.tsx
@@ -484,7 +484,7 @@ const SWhiteButton = styled(SRoundButton, {
   color: '$black100',
 });
 
-const SCardButton = styled('button', {
+const buttonStyles = {
   width: '50%',
   padding: '$13 0',
   textAlign: 'center',
@@ -502,19 +502,22 @@ const SCardButton = styled('button', {
       },
     },
   },
-});
+} as const;
 
-const SRejectButton = styled(SCardButton, {
+const SRejectButton = styled('button', {
+  ...buttonStyles,
   borderBottomRightRadius: '0',
 });
 
-const SApproveButton = styled(SCardButton, {
+const SApproveButton = styled('button', {
+  ...buttonStyles,
   color: '$black100',
   backgroundColor: '$white100',
   borderBottomLeftRadius: '0',
 });
 
-const SCancelButton = styled(SCardButton, {
+const SCancelButton = styled('button', {
+  ...buttonStyles,
   width: '100%',
 });