Skip to content

Commit

Permalink
[Feat] 아이콘, 색상 변경 사항 반영 (#72)
Browse files Browse the repository at this point in the history
* feat(packages/theme): 아이콘 변경 사항 반영

* fix(packages/ui): 누락된 아이콘 추가
  • Loading branch information
kongnayeon authored Jan 18, 2025
1 parent 7e20960 commit 5639eac
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 20 deletions.
2 changes: 1 addition & 1 deletion packages/theme/src/themes/dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const darkTheme: ThemeContract = {
colors: {
primary: tokens.colors.green200,
primary400to200: tokens.colors.green200,
primaryHover: tokens.colors.green100,
primaryHover: tokens.colors.green200, // TODO

warning: tokens.colors.warning300,

Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/themes/light.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const lightTheme: ThemeContract = {
colors: {
primary: tokens.colors.green200, // TODO: 삭제 예정
primary400to200: tokens.colors.green400, // TODO: 삭제 예정
primaryHover: tokens.colors.green300, // TODO: 삭제 예정
primaryHover: tokens.colors.green200, // TODO: 삭제 예정

warning: tokens.colors.warning500,

Expand Down
18 changes: 12 additions & 6 deletions packages/theme/src/tokens/colors.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
export const colors = {
green100: '#F1FFB5', // TODO: 삭제 예정
green200: '#E6FF79', // TODO: 삭제 예정
green300: '#D0F141', // TODO: 삭제 예정
green400: '#D2F634', // TODO: 삭제 예정

primary500: '#7081F4',
primary600: '#5266EC',
primary700: '#3348D6',
primary800: '#2035BC',
primary800: '#2035BC', // TODO 삭제 예정

warning300: '#FF724E',
warning500: '#FF3300',
Expand All @@ -16,6 +11,7 @@ export const colors = {

pink200: '#FFD6D6',
pink400: '#EAAEAE',
pink600: '#BF5E5E',
pink800: '#A63535',

orange200: '#FFEAD9',
Expand All @@ -26,12 +22,22 @@ export const colors = {
blue400: '#7698E2',
blue800: '#153C66',

purple200: '#E5CEFF',
purple400: '#B68AE7',
purple600: '#9365C5',
purple800: '#412274',

violet0: '#F2F3FF',
violet100: '#DFE1FE',
violet200: '#B7B4FF',
violet400: '#817ED5',
violet800: '#4A46A3',

green200: '#D1F9DF',
green400: '#76CE95',
green600: '#337B6E',
green800: '#224C38',

grey0: '#FFFFFF',
grey25: '#F7F9FB',
grey50: '#EAEFF4',
Expand Down
3 changes: 3 additions & 0 deletions packages/ui/src/assets/icons/IconArrowFillBottom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/ui/src/assets/icons/IconArrowFillTop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/ui/src/assets/icons/IconCheck.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/ui/src/assets/icons/IconCheckbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions packages/ui/src/assets/icons/IconTwinkle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/ui/src/assets/icons/IconUnSelectedCheckbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions packages/ui/src/assets/icons/_IconX.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions packages/ui/src/components/Icon/assets.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import IconArrowBottom from '@/assets/icons/IconArrowBottom.svg';
import IconArrowFillBottom from '@/assets/icons/IconArrowFillBottom.svg';
import IconArrowFillTop from '@/assets/icons/IconArrowFillTop.svg';
import IconArrowLeft from '@/assets/icons/IconArrowLeft.svg';
import IconArrowRight from '@/assets/icons/IconArrowRight.svg';
import IconArrowTop from '@/assets/icons/IconArrowTop.svg';
import IconCalendar from '@/assets/icons/IconCalendar.svg';
import IconChat from '@/assets/icons/IconChat.svg';
import IconCheck from '@/assets/icons/IconCheck.svg';
import IconCheckCalendar from '@/assets/icons/IconCheckCalendar.svg';
import IconCheckbox from '@/assets/icons/IconCheckbox.svg';
import IconDocument from '@/assets/icons/IconDocument.svg';
import IconLineThree from '@/assets/icons/IconLineThree.svg';
import IconNotice from '@/assets/icons/IconNotice.svg';
Expand All @@ -19,20 +22,23 @@ import IconSmile from '@/assets/icons/IconSmile.svg';
import IconStack from '@/assets/icons/IconStack.svg';
import IconStar from '@/assets/icons/IconStar.svg';
import IconTwinkle from '@/assets/icons/IconTwinkle.svg';
import IconUnSelectedCheckbox from '@/assets/icons/IconUnSelectedCheckbox.svg';
import IconX from '@/assets/icons/IconX.svg';
import IconXCircle from '@/assets/icons/IconXCircle.svg';
import IconCheckbox from '@/assets/icons/IconCheckbox.svg';
import IconUnSelectedCheckbox from '@/assets/icons/IconUnSelectedCheckbox.svg';
import _IconX from '@/assets/icons/_IconX.svg';

export const icons = {
arrowBottom: IconArrowBottom,
arrowFillBottom: IconArrowFillBottom,
arrowFillTop: IconArrowFillTop,
arrowLeft: IconArrowLeft,
arrowRight: IconArrowRight,
arrowTop: IconArrowTop,
calendar: IconCalendar,
chat: IconChat,
check: IconCheck,
checkCalendar: IconCheckCalendar,
checkbox: IconCheckbox,
document: IconDocument,
lineThree: IconLineThree,
notice: IconNotice,
Expand All @@ -46,8 +52,8 @@ export const icons = {
stack: IconStack,
star: IconStar,
twinkle: IconTwinkle,
unSelectedCheckbox: IconUnSelectedCheckbox,
x: IconX,
xCircle: IconXCircle,
checkbox: IconCheckbox,
unSelectedCheckbox: IconUnSelectedCheckbox,
iconX: _IconX,
};

0 comments on commit 5639eac

Please sign in to comment.