Merge pull request #456 from sparcs-kaist/feat/tag-modal-ui

Feat/tag modal UI
sparcs-kaist · Jan 10, 2024 · 40e203d · 40e203d
2 parents f81a811 + 7a1fc3f
commit 40e203d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git 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/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
@@ -21,7 +21,7 @@ export const SelectBox: React.FC<SelectBoxProps> = ({
       onChange={e => onChange(e.target.value)}
       defaultValue=""
     >
-      <option value="">전체보기</option>
+      <option value="">전체 보기</option>
       {options.map(option => (
         <option key={option} value={option}>
           {option}

diff --git a/packages/web/src/components/atoms/placeholder.css b/packages/web/src/components/atoms/placeholder.css
@@ -1,7 +1,7 @@
 ::placeholder {
   color: #d9d9d9;
 
-  font-family: "Noto Sansf KR";
+  font-family: "Noto Sans KR";
   font-size: 11px;
   font-style: normal;
   font-weight: 500;

diff --git 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<Props> = ({ tag }) => {
   const navigate = useNavigate();
   const openModal = () => navigate(`tagEdit?tagId=${tag.id}`);
   return (
-    <Card primary={false} round={5} onClick={openModal}>
+    <Card primary={false} round={5} onClick={openModal} clickable>
       <Box gap={8}>
         <Box gap={8} dir="row">
           <AdminTag tags={adminTags} suffix={tag.users.length} />

diff --git 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" }}
             >
               <Button w={300} h={42} onClick={onSubmit} disabled={!validated}>
-                <Text variant="boldtitle3" color="blue600">
+                <Text
+                  variant="boldtitle3"
+                  color={validated ? "blue600" : "gray300"}
+                >
                   태그 생성하기
                 </Text>
               </Button>