Skip to content

Commit 07544db

Browse files
MINJI121MINJI121
authored
Merge pull request #28 from part3-4team-Taskify/feature/GlobalStyle
[Feat] 공통 폰트 & 컬러 스타일 정의
2 parents b996975 + fe175e0 commit 07544db

File tree

7 files changed

+182
-32
lines changed

7 files changed

+182
-32
lines changed

‎.github/workflows/main.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Review Assign
2+
3+
on:
4+
pull_request:
5+
types: [opened, ready_for_review]
6+
7+
jobs:
8+
assign:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: hkusu/review-assign-action@v1
12+
with:
13+
github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
14+
assignees: ${{ github.actor }} # PR 작성자 자동 지정
15+
reviewers: gyoyeon-kim, hhjin1, MINJI121, ozen0718, rover1523 # 리뷰어 리스트

‎declares.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module "*.css";

‎postcss.config.mjs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
module.exports = {
1+
/** @type {import('tailwindcss').Config} */
2+
export default {
23
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
4+
"@tailwindcss/postcss": {},
55
},
66
};

src/pages/app.tsx renamed to src/pages/_app.tsx

File renamed without changes.

src/pages/document.tsx renamed to src/pages/_document.tsx

File renamed without changes.

‎src/styles/globals.css‎

Lines changed: 163 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,173 @@
11
@import "tailwindcss";
22

3-
:root {
4-
--background: #ffffff;
5-
--foreground: #171717;
3+
@layer base {
4+
body {
5+
font-family: "Pretendard", sans-serif;
6+
}
67
}
78

8-
@theme inline {
9-
--color-background: var(--background);
10-
--color-foreground: var(--foreground);
11-
--font-sans: var(--font-geist-sans);
12-
--font-mono: var(--font-geist-mono);
9+
@layer base {
10+
:root {
11+
--primary: #5534da;
12+
--color-violet8: #f1effd;
13+
--color-red: #d6173a;
14+
--color-green: #7ac555;
15+
--color-purple: #760dde;
16+
--color-orange: #ffa500;
17+
--color-blue: #76a5ea;
18+
--color-pink: #e876ea;
19+
--color-black: #000000;
20+
--color-black2: #171717;
21+
--color-black3: #333236;
22+
--color-black4: #4b4b4b;
23+
--color-gray1: #787486;
24+
--color-gray2: #9fa6b2;
25+
--color-gray3: #d9d9d9;
26+
--color-gray4: #eeeeee;
27+
--color-gray5: #fafafa;
28+
--color-white: #ffffff;
29+
--sortTextBgGreen: #e7f7db;
30+
--sortTextBgPink: #f7dbf0;
31+
--sortTextBgBlue: #dbe6f7;
32+
--sortTextBgOrange: #f9eee3;
33+
--sortTextGreen: #86d549;
34+
--sortTextPink: #d549b6;
35+
--sortTextBlue: #4981d5;
36+
--sortTextOrange: #d58d49;
37+
}
1338
}
1439

15-
@media (prefers-color-scheme: dark) {
16-
:root {
17-
--background: #0a0a0a;
18-
--foreground: #ededed;
40+
@layer utilities {
41+
.font-32b {
42+
@apply text-[32px] leading-[42px] font-bold;
43+
}
44+
.font-32sb {
45+
@apply text-[32px] leading-[42px] font-semibold;
46+
}
47+
48+
.font-24b {
49+
@apply text-[24px] leading-[32px] font-bold;
50+
}
51+
.font-24sb {
52+
@apply text-[24px] leading-[32px] font-semibold;
53+
}
54+
.font-24m {
55+
@apply text-[24px] leading-[32px] font-medium;
56+
}
57+
.font-24r {
58+
@apply text-[24px] leading-[32px] font-normal;
59+
}
60+
61+
.font-20b {
62+
@apply text-[20px] leading-[32px] font-bold;
63+
}
64+
.font-20sb {
65+
@apply text-[20px] leading-[32px] font-semibold;
66+
}
67+
.font-20m {
68+
@apply text-[20px] leading-[32px] font-medium;
69+
}
70+
.font-20r {
71+
@apply text-[20px] leading-[32px] font-normal;
72+
}
73+
74+
.font-18b {
75+
@apply text-[18px] leading-[26px] font-bold;
76+
}
77+
.font-18sb {
78+
@apply text-[18px] leading-[26px] font-semibold;
79+
}
80+
.font-18m {
81+
@apply text-[18px] leading-[26px] font-medium;
82+
}
83+
.font-18r {
84+
@apply text-[18px] leading-[26px] font-normal;
85+
}
86+
87+
.font-16b {
88+
@apply text-[16px] leading-[26px] font-bold;
1989
}
90+
.font-16sb {
91+
@apply text-[16px] leading-[26px] font-semibold;
92+
}
93+
.font-16m {
94+
@apply text-[16px] leading-[26px] font-medium;
95+
}
96+
.font-16r {
97+
@apply text-[16px] leading-[26px] font-normal;
98+
}
99+
100+
.font-14b {
101+
@apply text-[14px] leading-[24px] font-bold;
102+
}
103+
.font-14sb {
104+
@apply text-[14px] leading-[24px] font-semibold;
105+
}
106+
.font-14m {
107+
@apply text-[14px] leading-[24px] font-medium;
108+
}
109+
.font-14r {
110+
@apply text-[14px] leading-[24px] font-normal;
111+
}
112+
113+
.font-13sb {
114+
@apply text-[13px] leading-[22px] font-semibold;
115+
}
116+
.font-13m {
117+
@apply text-[13px] leading-[22px] font-medium;
118+
}
119+
120+
.font-12sb {
121+
@apply text-[12px] leading-[20px] font-semibold;
122+
}
123+
.font-12m {
124+
@apply text-[12px] leading-[18px] font-medium;
125+
}
126+
.font-12r {
127+
@apply text-[12px] leading-[18px] font-normal;
128+
}
129+
}
130+
131+
@font-face {
132+
font-family: "Pretendard";
133+
src: url("https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff2")
134+
format("woff2");
135+
src: url("https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff")
136+
format("woff");
137+
font-weight: 400;
138+
font-style: normal;
139+
font-display: swap;
140+
}
141+
142+
@font-face {
143+
font-family: "Pretendard";
144+
src: url("https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Medium.woff2")
145+
format("woff2");
146+
src: url("https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Medium.woff")
147+
format("woff");
148+
font-weight: 500;
149+
font-style: normal;
150+
font-display: swap;
151+
}
152+
153+
@font-face {
154+
font-family: "Pretendard";
155+
src: url("https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-SemiBold.woff2")
156+
format("woff2");
157+
src: url("https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-SemiBold.woff")
158+
format("woff");
159+
font-weight: 600;
160+
font-style: normal;
161+
font-display: swap;
20162
}
21163

22-
body {
23-
background: var(--background);
24-
color: var(--foreground);
25-
font-family: Arial, Helvetica, sans-serif;
164+
@font-face {
165+
font-family: "Pretendard";
166+
src: url("https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Bold.woff2")
167+
format("woff2");
168+
src: url("https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Bold.woff")
169+
format("woff");
170+
font-weight: 700;
171+
font-style: normal;
172+
font-display: swap;
26173
}

‎tailwind.config.ts‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +0,0 @@
1-
import type { Config } from "tailwindcss";
2-
3-
export default {
4-
content: [
5-
"./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
6-
"./src/components/**/*.{js,ts,jsx,tsx,mdx}",
7-
"./src/containers/**/*.{js,ts,jsx,tsx,mdx}",
8-
],
9-
theme: {
10-
extend: {},
11-
},
12-
plugins: [],
13-
} satisfies Config;

0 commit comments

Comments
 (0)