diff --git a/src/components/common/ItemWishList/ItemWishList.module.scss b/src/components/common/ItemWishList/ItemWishList.module.scss index 2b43dbd53..9e2b07361 100644 --- a/src/components/common/ItemWishList/ItemWishList.module.scss +++ b/src/components/common/ItemWishList/ItemWishList.module.scss @@ -1,12 +1,8 @@ -@import '../../../styles/utilities'; .heartToggle{ cursor: pointer; width: 2.4rem; height: 2.4rem; - path{ - stroke: var(--primary); - } } .isToggleOn{ svg path{ diff --git a/src/components/common/ItemWishList/ItemWishList.tsx b/src/components/common/ItemWishList/ItemWishList.tsx index d1161e733..74d0b3b04 100644 --- a/src/components/common/ItemWishList/ItemWishList.tsx +++ b/src/components/common/ItemWishList/ItemWishList.tsx @@ -8,7 +8,7 @@ interface Props { onChange?: () => void } -const ItemWishList = memo(({isActive, onChange}:Props) => { +const ItemWishList = memo(({isActive=false, onChange}:Props) => { return(
{ + return( + + ) +} + +export default SelectCommon \ No newline at end of file diff --git a/src/components/common/ViewAllItem/ViewAllItem.module.scss b/src/components/common/ViewAllItem/ViewAllItem.module.scss index 192889f1b..4b8b6fe6d 100644 --- a/src/components/common/ViewAllItem/ViewAllItem.module.scss +++ b/src/components/common/ViewAllItem/ViewAllItem.module.scss @@ -1,18 +1,16 @@ -@import '../../../styles/utilities'; +@import "../../../styles/utilities"; -.viewAll{ +.viewAll { display: flex; - color: var(--primary); - .conTent{ + .content { + color: var(--primary); margin: 0.8rem 0.8rem 0.8rem 1.6rem; font-weight: bold; } - .vector{ + .vector { margin: 0.8rem 0rem 0.8rem 0rem; - svg path{ + svg path { fill: var(--primary); } } } - - diff --git a/src/components/common/ViewAllItem/ViewAllItem.tsx b/src/components/common/ViewAllItem/ViewAllItem.tsx index 6308357e4..1a3171e7b 100644 --- a/src/components/common/ViewAllItem/ViewAllItem.tsx +++ b/src/components/common/ViewAllItem/ViewAllItem.tsx @@ -10,7 +10,7 @@ const ViewAllItem = ({ link }: Props) => { return(
- + View All diff --git a/src/components/common/index.ts b/src/components/common/index.ts index 8e796f820..2ff7a6557 100644 --- a/src/components/common/index.ts +++ b/src/components/common/index.ts @@ -19,3 +19,4 @@ export { default as Footer} from './Footer/Footer' export { default as MenuDropdown} from './MenuDropdown/MenuDropdown' export { default as NotiMessage} from './NotiMessage/NotiMessage' export { default as VideoPlayer} from './VideoPlayer/VideoPlayer' +export { default as SelectCommon} from './SelectCommon/SelectCommon' diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts index eeaffb85b..038ab076d 100644 --- a/src/components/icons/index.ts +++ b/src/components/icons/index.ts @@ -1,4 +1,5 @@ export { default as IconBuy } from './IconBuy' +<<<<<<< HEAD export { default as ArrowUp } from './IconArrowUp' export { default as IconSearch } from './IconSearch' export { default as IconArrowRight } from './IconArrowRight' @@ -8,3 +9,7 @@ export { default as IconInfo } from './IconInfo' export { default as IconHome } from './IconHome' export { default as IconShopping } from './IconShopping' export { default as IconHeart } from './IconHeart' +======= +export { default as IconHeart } from './IconHeart' +export { default as IconVector } from './IconVector' +>>>>>>> 7d55bbf46e49a375575303f16ec393462c6c573d