Skip to content

Commit e812b41

Browse files
authored
Merge pull request #10 from part3-4team-Taskify/feature/GlobalStyle
[Feat] 전역 스타일링 추가
2 parents c56fdcf + cc112cb commit e812b41

File tree

2 files changed

+58
-1
lines changed

2 files changed

+58
-1
lines changed

src/pages/components/Gnb.tsx

Whitespace-only changes.

tailwind.config.ts

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,64 @@ export default {
77
"./src/containers/**/*.{js,ts,jsx,tsx,mdx}",
88
],
99
theme: {
10-
extend: {},
10+
extend: {
11+
fontFamily: {
12+
pretendard: ["Pretendard"],
13+
},
14+
fontSize: {
15+
"3xl-Bold": ["32px", { lineHeight: "42px", fontWeight: "700" }],
16+
"3xl-Semibold": ["32px", { lineHeight: "42px", fontWeight: "600" }],
17+
"2xl-Bold": ["24px", { lineHeight: "32px", fontWeight: "700" }],
18+
"2xl-Semibold": ["24px", { lineHeight: "32px", fontWeight: "600" }],
19+
"2xl-Medium": ["24px", { lineHeight: "32px", fontWeight: "500" }],
20+
"2xl-Regular": ["24px", { lineHeight: "32px", fontWeight: "400" }],
21+
"xl-Bold": ["20px", { lineHeight: "32px", fontWeight: "700" }],
22+
"xl-Semibold": ["20px", { lineHeight: "32px", fontWeight: "600" }],
23+
"xl-Medium": ["20px", { lineHeight: "32px", fontWeight: "500" }],
24+
"xl-Regular": ["20px", { lineHeight: "32px", fontWeight: "400" }],
25+
"2lg-Bold": ["18px", { lineHeight: "26px", fontWeight: "700" }],
26+
"2lg-Semibold": ["18px", { lineHeight: "26px", fontWeight: "600" }],
27+
"2lg-Medium": ["18px", { lineHeight: "26px", fontWeight: "500" }],
28+
"2lg-Regular": ["18px", { lineHeight: "26px", fontWeight: "400" }],
29+
"lg-Bold": ["16px", { lineHeight: "26px", fontWeight: "700" }],
30+
"lg-Semibold": ["16px", { lineHeight: "26px", fontWeight: "600" }],
31+
"lg-Medium": ["16px", { lineHeight: "26px", fontWeight: "500" }],
32+
"lg-Regular": ["16px", { lineHeight: "26px", fontWeight: "400" }],
33+
"md-Bold": ["14px", { lineHeight: "24px", fontWeight: "700" }],
34+
"md-Semibold": ["14px", { lineHeight: "24px", fontWeight: "600" }],
35+
"md-Medium": ["14px", { lineHeight: "24px", fontWeight: "500" }],
36+
"md-Regular": ["14px", { lineHeight: "24px", fontWeight: "400" }],
37+
"sm-Semibold": ["13px", { lineHeight: "22px", fontWeight: "600" }],
38+
"sm-Medium": ["13px", { lineHeight: "22px", fontWeight: "500" }],
39+
"xs-Semibold": ["12px", { lineHeight: "20px", fontWeight: "600" }],
40+
"xs-Medium": ["12px", { lineHeight: "18px", fontWeight: "500" }],
41+
"xs-Regular": ["12px", { lineHeight: "18px", fontWeight: "400" }],
42+
},
43+
colors: {
44+
primary: "#5534DA",
45+
secondary: "#F1EFFD",
46+
red: "#D6173A",
47+
green: "#7AC555",
48+
purple: "#760DDF",
49+
orange: "#FFA500",
50+
blue: "#76A5EA",
51+
pink: "#E876EA",
52+
wihte: "#FFFFFF",
53+
black: {
54+
1000: "#000000",
55+
900: "#171717",
56+
800: "#333236",
57+
700: "#4B4B4B",
58+
},
59+
glay: {
60+
1000: "#787486",
61+
900: "#9FA6B2",
62+
800: "#D9D9D9",
63+
700: "#EEEEEE",
64+
600: "#FAFAFA",
65+
},
66+
},
67+
},
1168
},
1269
plugins: [],
1370
} satisfies Config;

0 commit comments

Comments
 (0)