Skip to content

Commit 1eed66f

Browse files
committed
Fix: 충돌 해결
2 parents 5dac018 + c8451e8 commit 1eed66f

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

src/pages/MyPage/ButtonSecondary/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const ButtonSecondary: React.FC = () => {
88
const navigate = useNavigate();
99

1010
const handleClick = () => {
11-
navigate('/profile/edit'); // 경로 수정했음
11+
navigate('/profile/edit');
1212
};
1313

1414
return (

src/pages/MyPage/ButtonSecondary/styles.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ import styled from 'styled-components';
22

33
export const Button = styled.button`
44
width: 100%;
5-
padding: 6px;
65
margin: 1.25rem auto;
7-
height: 3.1rem; /* 44px */
6+
height: 3.1rem;
87
text-align: center;
98
color: #ff2389;
109
cursor: pointer;
1110
box-sizing: border-box;
1211
border: 1px solid;
1312
border-radius: 10px;
1413
border-color: #ff2389;
15-
padding: 10px; /* 텍스트가 보더와 겹치지 않게 패딩 설정 */
14+
padding: 10px;
1615
`;

0 commit comments

Comments
 (0)