From 3cb85ebb3421a0bed10515f1a8b34c9208bd6c54 Mon Sep 17 00:00:00 2001 From: Yumin Cho Date: Thu, 4 Jan 2024 22:21:05 +0900 Subject: [PATCH 1/2] fix: button behavior --- packages/web/src/components/atoms/Button.tsx | 4 ++-- packages/web/src/components/molecules/UserTagCards.tsx | 2 +- packages/web/src/components/organisms/CreateUserTagModal.tsx | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/web/src/components/atoms/Button.tsx b/packages/web/src/components/atoms/Button.tsx index 6282c1fb..c48b4cbb 100644 --- a/packages/web/src/components/atoms/Button.tsx +++ b/packages/web/src/components/atoms/Button.tsx @@ -32,8 +32,8 @@ export const Button = styled.button<{ } &:disabled { - cursor: none; - background-color: ${theme.colors.white}; + cursor: not-allowed; + background-color: ${theme.colors.gray100}; } `, ); diff --git a/packages/web/src/components/molecules/UserTagCards.tsx b/packages/web/src/components/molecules/UserTagCards.tsx index 42012c03..0d4f6693 100644 --- a/packages/web/src/components/molecules/UserTagCards.tsx +++ b/packages/web/src/components/molecules/UserTagCards.tsx @@ -18,7 +18,7 @@ export const UserTagCards: React.FC = ({ tag }) => { const navigate = useNavigate(); const openModal = () => navigate(`tagEdit?tagId=${tag.id}`); return ( - + diff --git a/packages/web/src/components/organisms/CreateUserTagModal.tsx b/packages/web/src/components/organisms/CreateUserTagModal.tsx index bcbcb3e0..9c39de8d 100644 --- a/packages/web/src/components/organisms/CreateUserTagModal.tsx +++ b/packages/web/src/components/organisms/CreateUserTagModal.tsx @@ -83,7 +83,10 @@ export const CreateUserTagModal: React.FC = () => { style={{ textDecoration: "none" }} > From 7a1fc3f1e652086e26737e656ae547fcca0e5038 Mon Sep 17 00:00:00 2001 From: Yumin Cho Date: Thu, 4 Jan 2024 22:22:00 +0900 Subject: [PATCH 2/2] fix: font style in select --- packages/web/src/components/atoms/Label.tsx | 2 +- packages/web/src/components/atoms/SelectBox.tsx | 2 +- packages/web/src/components/atoms/placeholder.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/web/src/components/atoms/Label.tsx b/packages/web/src/components/atoms/Label.tsx index c800b542..f3ab9019 100644 --- a/packages/web/src/components/atoms/Label.tsx +++ b/packages/web/src/components/atoms/Label.tsx @@ -17,7 +17,7 @@ export const Select = styled.select<{ w: number; h: number }>` border: 1px solid ${props => props.theme.colors.gray200}; background-color: ${props => props.theme.colors.white}; - font-family: "Noto Sansf KR"; + font-family: "Noto Sans KR"; font-size: 10px; font-style: normal; font-weight: 500; diff --git a/packages/web/src/components/atoms/SelectBox.tsx b/packages/web/src/components/atoms/SelectBox.tsx index 4af10efc..3d8cd81f 100644 --- a/packages/web/src/components/atoms/SelectBox.tsx +++ b/packages/web/src/components/atoms/SelectBox.tsx @@ -21,7 +21,7 @@ export const SelectBox: React.FC = ({ onChange={e => onChange(e.target.value)} defaultValue="" > - + {options.map(option => (