Merge pull request #1005 from peer-42seoul/fix/typo-contained-button

[1.0.3 / style] contained button 내부 텍스트 색상 수정
peer-42seoul · Feb 14, 2024 · 4e39421 · 4e39421
2 parents 38e53f2 + eeaf434
commit 4e39421
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/app/my-page/message/@list/page.tsx b/src/app/my-page/message/@list/page.tsx
@@ -24,7 +24,6 @@ const NewMessageButton = ({ openModal }: { openModal: () => void }) => {
         variant={'contained'}
         startIcon={<PlusIcon width={'1.25rem'} height={'1.25rem'} />}
         style={style.pcSendButton}
-        TypographyProps={{ color: '#ffffff' }}
       />
     </Stack>
   )

diff --git a/src/app/panel/main-page/FloatEditButton.tsx b/src/app/panel/main-page/FloatEditButton.tsx
@@ -20,7 +20,7 @@ const FloatEditButton = () => {
         >
           <WriteIcon
             sx={{
-              color: 'text.normal',
+              color: '#ffffff',
             }}
           />
         </Stack>

diff --git a/src/components/CuButton.tsx b/src/components/CuButton.tsx
@@ -43,7 +43,12 @@ const CuButton = ({
       disabled={disabled}
       form={form}
     >
-      <Typography {...TypographyProps}>{message}</Typography>
+      <Typography
+        {...TypographyProps}
+        color={variant === 'contained' ? '#ffffff' : ''}
+      >
+        {message}
+      </Typography>
     </Button>
   )
 }

diff --git a/src/components/CuModal.style.ts b/src/components/CuModal.style.ts
@@ -92,5 +92,5 @@ export const containedButton = {
 
 export const containedButtonTypo = {
   ...modalButtonTypoBase,
-  color: (theme: Theme) => theme.palette.text.normal,
+  color: "#ffffff",
 }