Skip to content

Commit

Permalink
[Feature/BAR-49] 디자인 시스템 반영 (#13)
Browse files Browse the repository at this point in the history
* feat: import 순서 정리

* feat: grid, flex에서 style 관련된 요소는 모두 className을 통해 들어오도록 변경

* feat: 파일명 변경

* feat: 폰트와 color에 대한 디자인 시스템 반영

* feat: 불필요 부분 모두 제거

* feat: lint 추가 반영

* feat: Grid, Flex 컴포넌트 제거

* refactor: 변수명 변경

* feat: 사용하지 않는 토큰 제거

* feat: font, color 수정 부분 반영
  • Loading branch information
miro-ring authored Dec 27, 2023
1 parent 832db45 commit 8c6b82e
Show file tree
Hide file tree
Showing 14 changed files with 188 additions and 559 deletions.
8 changes: 4 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
"warn",
{
"groups": [
// Library imports (related with next is first)
["next", "^\\w"],
// Side effect imports
["^\\u0000"]
["^next", "^react", "^@\\w", "^\\w"],
["^\\u0000"],
["^@/"],
["^\\."]
]
}
]
Expand Down
1 change: 0 additions & 1 deletion src/components/Providers/TanstackQueryProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { type PropsWithChildren, useState } from 'react';

import {
type DehydratedState,
HydrationBoundary,
Expand Down
26 changes: 0 additions & 26 deletions src/components/common/Flex/Flex.stories.tsx

This file was deleted.

38 changes: 0 additions & 38 deletions src/components/common/Flex/Flex.tsx

This file was deleted.

49 changes: 0 additions & 49 deletions src/components/common/Grid/Grid.stories.tsx

This file was deleted.

38 changes: 0 additions & 38 deletions src/components/common/Grid/Grid.tsx

This file was deleted.

40 changes: 0 additions & 40 deletions src/components/common/Grid/GridItem.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions src/components/common/utils.tsx

This file was deleted.

7 changes: 4 additions & 3 deletions src/styles/global.css.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { fontFamily } from './variants.css';
import { globalStyle } from '@vanilla-extract/css';

import { theme } from './theme.css';

globalStyle('*, *:after, *:before', {
boxSizing: 'border-box',
});
Expand All @@ -13,7 +14,7 @@ globalStyle(
border: 0,
fontSize: '16px',
verticalAlign: 'baseline',
fontFamily: fontFamily.pretendard,
fontFamily: theme.font.pretendard,
},
);

Expand Down Expand Up @@ -45,7 +46,7 @@ globalStyle('button, select, input, textarea', {
border: 0,
outline: 0,
backgroundColor: 'transparent',
fontFamily: fontFamily.pretendard,
fontFamily: theme.font.pretendard,
});

globalStyle('a, button', {
Expand Down
Loading

0 comments on commit 8c6b82e

Please sign in to comment.