Skip to content

Commit

Permalink
[#5] refactor: 각 theme에 defaultTheme을 spread 하는 방식으로 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
jiyong1 committed Dec 27, 2021
1 parent faad7e5 commit c8399a8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/components/feedback/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const feedbackListItemWrapperStyle = css`

export const feedbackTitleStyle = (theme: Theme): SerializedStyles => css`
font-size: 12px;
color: ${theme.colorOriginPrimary};
color: ${theme.colorPrimary};
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
Expand Down
14 changes: 4 additions & 10 deletions src/styles/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const defaultTheme = {
};

const primaryTheme = {
colorOriginPrimary: defaultTheme.colorPrimary,
...defaultTheme,
colorDefault: defaultTheme.colorPrimary,
colorReverse: defaultTheme.colorBg,
colorGray: defaultTheme.colorGray4,
Expand All @@ -31,13 +31,10 @@ const primaryTheme = {
colorBottomWrapper: defaultTheme.colorSubLight,
colorBottomText: defaultTheme.colorBrown,
colorBottomButton: defaultTheme.colorPrimary,

fontBasic: defaultTheme.fontBasic,
fontCoding: defaultTheme.fontCoding,
fontCodingBold: defaultTheme.fontCodingBold,
colorChatText: defaultTheme.colorGray1,
};
const subTheme = {
colorOriginPrimary: defaultTheme.colorPrimary,
...defaultTheme,
colorDefault: defaultTheme.colorPrimaryLight,
colorReverse: defaultTheme.colorPrimary,
colorGray: defaultTheme.colorGray1,
Expand All @@ -47,10 +44,7 @@ const subTheme = {
colorBottomWrapper: defaultTheme.colorPrimary,
colorBottomText: defaultTheme.colorWhite,
colorBottomButton: defaultTheme.colorSubLight,

fontBasic: defaultTheme.fontBasic,
fontCoding: defaultTheme.fontCoding,
fontCodingBold: defaultTheme.fontCodingBold,
colorChatText: defaultTheme.colorWhite,
};

export default defaultTheme;
Expand Down

0 comments on commit c8399a8

Please sign in to comment.