Skip to content

Commit

Permalink
Merge branch 'chore/#127'
Browse files Browse the repository at this point in the history
  • Loading branch information
selfishAltruism committed Sep 2, 2024
2 parents 9fddfed + 7ee2f2f commit ef5a484
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
8 changes: 8 additions & 0 deletions src/components/Atoms/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ export const NavButton = styled(Button)`
margin: 13px 0;
`;

export const AdditionNavButton = styled(Button)`
margin: 13px 0;
background-color: white;
color: #312ed7;
border: 1px solid #312ed7;
margin: 13px 0px 0px 0px;
`;

export const NavSmallButton = styled(Button)`
margin: 13px 0;
font-size: 15px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { computed } from 'mobx';
import { observer } from 'mobx-react-lite';
import { useCallback } from 'react';

import { NavButton, PageFooter } from '@/components';
import { NavButton, PageFooter, AdditionNavButton } from '@/components';
import { usePageUiStore } from '@/hooks';

export const SubmitButton = observer(() => {
Expand Down Expand Up @@ -30,21 +30,12 @@ export const SubmitButton = observer(() => {

return (
<PageFooter>
{/* {isSelectedMine ? (
{isSelectedMine ? (
// TODO : 반복 버튼 컴포넌트 만들기
<NavButton
disabled={!target}
onClick={extendClick(isSelectedMine, target)}
style={{
backgroundColor: 'white',
color: '#312ed7',
border: '1px solid #312ed7',
margin: '13px 0px 0px 0px',
}}
>
<AdditionNavButton disabled={!target} onClick={extendClick(isSelectedMine, target)}>
연장하기
</NavButton>
) : null} */}
</AdditionNavButton>
) : null}
<NavButton disabled={!target || isSelectedMine} onClick={handleClick(isSelectedMine, target)}>
신청하기
</NavButton>
Expand Down

0 comments on commit ef5a484

Please sign in to comment.