Skip to content

Commit 519ade5

Browse files
authored
Merge pull request #35 from boostcampwm-2024/feature-fe-#34
스타일링 초기 세팅
2 parents 7784c51 + a59338c commit 519ade5

File tree

8 files changed

+45
-1
lines changed

8 files changed

+45
-1
lines changed

frontend/.prettierrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"printWidth": 80,
3+
"tabWidth": 2,
4+
"plugins": ["prettier-plugin-tailwindcss"]
5+
}

frontend/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
"dependencies": {
1313
"@tanstack/react-query": "^5.59.19",
1414
"autoprefixer": "^10.4.20",
15+
"clsx": "^2.1.1",
1516
"postcss": "^8.4.47",
1617
"react": "^18.3.1",
1718
"react-dom": "^18.3.1",
19+
"tailwind-merge": "^2.5.4",
1820
"tailwindcss": "^3.4.14",
1921
"zustand": "^5.0.1"
2022
},
@@ -27,6 +29,8 @@
2729
"eslint-plugin-react-hooks": "^5.0.0",
2830
"eslint-plugin-react-refresh": "^0.4.14",
2931
"globals": "^15.11.0",
32+
"prettier": "^3.3.3",
33+
"prettier-plugin-tailwindcss": "^0.6.8",
3034
"typescript": "~5.6.2",
3135
"typescript-eslint": "^8.11.0",
3236
"vite": "^5.4.10"
264 KB
Binary file not shown.
262 KB
Binary file not shown.
262 KB
Binary file not shown.

frontend/src/index.css

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
11
@tailwind base;
22
@tailwind components;
33
@tailwind utilities;
4+
5+
@font-face {
6+
font-family: "Pretendard";
7+
font-style: normal;
8+
font-weight: 600;
9+
src:
10+
local("Pretendard Bold"),
11+
url("./assets/fonts/Pretendard-Bold.subset.woff2") format("woff2");
12+
}
13+
14+
@font-face {
15+
font-family: "Pretendard";
16+
font-style: normal;
17+
font-weight: 500;
18+
src:
19+
local("Pretendard SemiBold"),
20+
url("./assets/fonts/Pretendard-SemiBold.subset.woff2") format("woff2");
21+
}
22+
23+
@font-face {
24+
font-family: "Pretendard";
25+
font-style: normal;
26+
font-weight: 400;
27+
src:
28+
local("Pretendard Medium"),
29+
url("./assets/fonts/Pretendard-Medium.subset.woff2") format("woff2");
30+
}

frontend/src/lib/utils.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { clsx, type ClassValue } from "clsx";
2+
import { twMerge } from "tailwind-merge";
3+
4+
export function cn(...inputs: ClassValue[]) {
5+
return twMerge(clsx(inputs));
6+
}

frontend/tailwind.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
export default {
33
content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
44
theme: {
5+
fontFamily: {
6+
pretendard: ["Pretendard"],
7+
},
58
extend: {},
69
},
7-
plugins: [],
810
};

0 commit comments

Comments
 (0)