diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 31e222df..fe850cb3 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,10 +1,15 @@ -> 이 PR이 BREAKING_CHANGE를 포함하고 있다면 반드시 명시해주세요! + + ## 변경사항 어떤 사항이 변경되었는지 자세히 적어주세요! -## 디자인 시안 링크 -디자인 시안 링크를 첨부해주세요! + ## 집중적으로 리뷰 받고 싶은 부분이 있나요? - diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx index 6dfd59fb..cae091ef 100644 --- a/src/components/Icon/index.tsx +++ b/src/components/Icon/index.tsx @@ -25,7 +25,7 @@ type Props = CombineElementProps< const Icon = ({ name, size = 16, - type: propsType = 'outline', + type: propsType = 'filled', color = colors.gray100, className, ...rest @@ -63,14 +63,7 @@ const Icon = ({ return ( diff --git a/src/sass/components/_Icon.scss b/src/sass/components/_Icon.scss index fb346a53..5ec6c335 100644 --- a/src/sass/components/_Icon.scss +++ b/src/sass/components/_Icon.scss @@ -1,15 +1,7 @@ .lubycon-icon { display: inline-block; - &--outline { - path { - fill: transparent; - } - } - &--filled { - path { - stroke: transparent; - } - } + fill: currentColor; + &__icon-body { &--hide-origin-icon { display: none; diff --git a/src/stories/Components/Icons/index.stories.mdx b/src/stories/Components/Icons/index.stories.mdx index 4667f1eb..ba409352 100644 --- a/src/stories/Components/Icons/index.stories.mdx +++ b/src/stories/Components/Icons/index.stories.mdx @@ -4,6 +4,7 @@ import Icon, { IconType } from '../../../components/Icon'; import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks'; import { colors, ColorProperty } from '../../../constants/colors'; import { Fragment } from 'react'; +import { commonIcons, logoIcons } from './data'; @@ -22,12 +23,26 @@ Lubycon UI Kit은 ionicons를 기반으로 하는 `Icon` 컴포넌트를 제공 이렇게 Fallback PNG 아이콘이 렌더된 경우에는 아이콘의 색상을 변경할 수 없기 때문에 `Black(#000000)` 색상으로 렌더됩니다. - - - - - - + + + {commonIcons.map((icon) => ( + + + + ))} + + + + + + + + {logoIcons.map((icon) => ( + + + + ))} + @@ -55,6 +70,9 @@ ionicons는 `filled`, `outline`, `sharp` 총 3가지의 아이콘 타입을 제 + + +