diff --git a/src/assets/icons/filter.svg b/src/assets/icons/filter.svg new file mode 100644 index 0000000..ab60d2a --- /dev/null +++ b/src/assets/icons/filter.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/home-filled.svg b/src/assets/icons/home-filled.svg new file mode 100644 index 0000000..1d8a114 --- /dev/null +++ b/src/assets/icons/home-filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/home.svg b/src/assets/icons/home.svg new file mode 100644 index 0000000..98dee52 --- /dev/null +++ b/src/assets/icons/home.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/home_fill_24px.svg b/src/assets/icons/home_fill_24px.svg deleted file mode 100644 index 7476758..0000000 --- a/src/assets/icons/home_fill_24px.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/assets/icons/home_outline_24px.svg b/src/assets/icons/home_outline_24px.svg deleted file mode 100644 index 5f430dd..0000000 --- a/src/assets/icons/home_outline_24px.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/assets/icons/talk.svg b/src/assets/icons/talk.svg new file mode 100644 index 0000000..36e473c --- /dev/null +++ b/src/assets/icons/talk.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/vote.svg b/src/assets/icons/vote.svg new file mode 100644 index 0000000..34e7064 --- /dev/null +++ b/src/assets/icons/vote.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/common/BottomSheet/BottomSheet.tsx b/src/components/common/BottomSheet/BottomSheet.tsx index d4baa59..e66f3a4 100644 --- a/src/components/common/BottomSheet/BottomSheet.tsx +++ b/src/components/common/BottomSheet/BottomSheet.tsx @@ -15,8 +15,8 @@ export default function BottomSheet({ const { closeBottomSheet } = useBottomSheet(); return ( -
-

+
+

{title}

{hasCloseButton && ( @@ -27,7 +27,7 @@ export default function BottomSheet({ )} -
{children}
+
{children}
); } diff --git a/src/components/common/Button/Button.tsx b/src/components/common/Button/Button.tsx index 5748a69..782fd8f 100644 --- a/src/components/common/Button/Button.tsx +++ b/src/components/common/Button/Button.tsx @@ -12,12 +12,12 @@ const buttonVariants = cva( outline: 'border bg-gray-100', }, size: { - small: 'w-[157px] h-[40px] rounded-lg text-label-medium', - medium: 'w-[212px] h-[48px] rounded-xl text-title-small', - large: 'w-full h-[63px] rounded-2xl text-title-medium', + small: 'w-[157px] h-[40px] rounded-lg text-label-medium', + medium: 'w-[212px] h-[46px] rounded-xl text-label-large', + large: 'w-full h-[58px] rounded-2xl text-title-small-1', }, solidType: { - primary: 'bg-primary-400', + primary: 'bg-primary-500', secondary: 'bg-primary-600 ', disabled: 'bg-gray-500 text-gray-100', }, diff --git a/src/components/common/Header/Header.tsx b/src/components/common/Header/Header.tsx index cfbe835..6c3513b 100644 --- a/src/components/common/Header/Header.tsx +++ b/src/components/common/Header/Header.tsx @@ -16,14 +16,14 @@ export function Header({ return (
-
{leftNode}
+
{leftNode}
{centerNode} -
{rightNode}
+
{rightNode}
); } diff --git a/src/components/common/Icon/Icon.tsx b/src/components/common/Icon/Icon.tsx index 39f3ce1..fb944c2 100644 --- a/src/components/common/Icon/Icon.tsx +++ b/src/components/common/Icon/Icon.tsx @@ -12,12 +12,13 @@ import BookmarkOutline from '@/assets/icons/bookmark_outline_24px.svg?react'; import Check from '@/assets/icons/check_24px.svg?react'; import Cross from '@/assets/icons/cross_24px.svg?react'; import Edit from '@/assets/icons/edit_24px.svg?react'; +import Filter from '@/assets/icons/filter.svg?react'; import HeartFill from '@/assets/icons/heart_fill_24px.svg?react'; import HeartFillRed from '@/assets/icons/heart_fill_Red.svg?react'; import HeartOutline from '@/assets/icons/heart_outline_24px.svg?react'; import HeartOutlineWhite from '@/assets/icons/heart_outline_white.svg?react'; -import HomeFill from '@/assets/icons/home_fill_24px.svg?react'; -import HomeOutline from '@/assets/icons/home_outline_24px.svg?react'; +import HomeFilled from '@/assets/icons/home-filled.svg?react'; +import HomeOutline from '@/assets/icons/home.svg?react'; import KakaoLogo from '@/assets/icons/kako_logo.svg?react'; import Link from '@/assets/icons/link_24px.svg?react'; import LinkWhite from '@/assets/icons/link_white.svg?react'; @@ -43,6 +44,7 @@ import Post from '@/assets/icons/post_24px.svg?react'; import SearchFill from '@/assets/icons/search_fill_24px.svg?react'; import Send from '@/assets/icons/send_24px.svg?react'; import SettingsOutline from '@/assets/icons/settings_outline_24px.svg?react'; +import Talk from '@/assets/icons/talk.svg?react'; import ThumbUpFill from '@/assets/icons/thumb-up_fill_24px.svg?react'; import ThumbUpOutline from '@/assets/icons/thumb-up_outline_24px.svg?react'; import ToastError from '@/assets/icons/toast_error.svg?react'; @@ -54,9 +56,14 @@ import User2Fill from '@/assets/icons/user2_fill_24px.svg?react'; import User2Outline from '@/assets/icons/user2_outline_24px.svg?react'; import UserFill from '@/assets/icons/user_fill_24px.svg?react'; import UserOutline from '@/assets/icons/user_outline_24px.svg?react'; +import Vote from '@/assets/icons/vote.svg?react'; import VoteClose from '@/assets/icons/vote_close.svg?react'; import World from '@/assets/icons/world_24px.svg?react'; export const ICONS = { + Vote, + Talk, + HomeFilled, + Filter, ArrowRightPurple, PlusGray, AlertFill, @@ -74,7 +81,6 @@ export const ICONS = { HeartFill, HeartFillRed, HeartOutline, - HomeFill, HomeOutline, Link, LockFill, @@ -117,9 +123,11 @@ export const ICONS = { } as const; export const ICON_SIZE = { + 'extra-small': 12, small: 16, medium: 24, large: 32, + 'extra-large': 40, } as const; export interface IconProps extends SVGProps { diff --git a/src/components/common/LinkShareBottomSheet/LinkShareBottomSheet.tsx b/src/components/common/LinkShareBottomSheet/LinkShareBottomSheet.tsx index 1e7750c..3a3f1d9 100644 --- a/src/components/common/LinkShareBottomSheet/LinkShareBottomSheet.tsx +++ b/src/components/common/LinkShareBottomSheet/LinkShareBottomSheet.tsx @@ -16,7 +16,7 @@ export default function LinkShareBottomSheet({ return ( -
+
diff --git a/src/components/common/TextField/TextField.tsx b/src/components/common/TextField/TextField.tsx index d96b5ac..06944e3 100644 --- a/src/components/common/TextField/TextField.tsx +++ b/src/components/common/TextField/TextField.tsx @@ -39,7 +39,7 @@ const TextField = React.forwardRef(