Skip to content

Commit 84aefb4

Browse files
Yun-JinwooYun-Jinwoo
authored
Merge pull request #16 from codeit-maso/feature/Yun
공통 컴포넌트 구현 - Card, Badge
2 parents 2762653 + 47780dc commit 84aefb4

File tree

22 files changed

+237
-23
lines changed

22 files changed

+237
-23
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

‎.prettierrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
"printWidth": 80,
99
"arrowParens": "always",
1010
"bracketSpacing": true,
11-
"bracketSameLine": false
11+
"bracketSameLine": false,
12+
"endOfLine": "auto"
1213
}

‎index.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
<head>
44
<meta charset="UTF-8" />
55
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
6+
<link
7+
rel="stylesheet"
8+
as="style"
9+
crossorigin
10+
href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard.min.css"
11+
/>
612
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
713
<title>Vite + React</title>
814
</head>

‎public/.gitkeep‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/App.jsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import './base.scss';
2+
13
function App() {
24
return (
35
<div className="app">

‎src/api/.gitkeep‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/assets/images/.gitkeep‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/assets/images/delete.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎src/assets/images/plus.png‎

2.08 KB
Loading

‎src/assets/styles/.gitkeep‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)