Skip to content

Commit 3e8ef37

Browse files
authored
Merge pull request #31 from geulDa/fix/#27/color-chip
⚙️Setting : border 오류 & 폰트 수정
2 parents f7643f2 + 0667b61 commit 3e8ef37

File tree

2 files changed

+26
-20
lines changed

2 files changed

+26
-20
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"tailwindCSS.emmetCompletions": true,
2323
"editor.suggest.preview": true,
2424
"editor.colorDecorators": true,
25-
"editor.defaultColorDecorators": true,
25+
"editor.defaultColorDecorators": "auto",
2626
"tailwindCSS.colorDecorators": true
2727
}

src/styles/globals.css

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import 'tailwindcss';
2-
@import 'tailwindcss/preflight';
32
@import url("https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/static/pretendard.min.css");
43

54
@font-face {
@@ -114,7 +113,6 @@ html, body {
114113
@utility text-mint-900 { color: var(--color-mint-900)!important; }
115114

116115

117-
118116
/* Pink */
119117
@utility bg-pink-50 { background-color: var(--color-pink-50)!important; }
120118
@utility bg-pink-100 { background-color: var(--color-pink-100)!important; }
@@ -138,6 +136,8 @@ html, body {
138136
@utility text-pink-800 { color: var(--color-pink-800)!important; }
139137
@utility text-pink-900 { color: var(--color-pink-900)!important; }
140138

139+
140+
141141
/* Gray */
142142
@utility bg-gray-50 { background-color: var(--color-gray-50)!important; }
143143
@utility bg-gray-100 { background-color: var(--color-gray-100)!important; }
@@ -180,32 +180,38 @@ html, body {
180180

181181

182182
/* 폰트 *//* Pretendard */
183-
@utility text-display-lg { font-size:5.7rem; font-weight:300; line-height:6.4rem; letter-spacing:-0.025rem; font-family: var(--font-sans); }
184-
@utility text-display-md { font-size:5.2rem; font-weight:300; line-height:4.5rem; font-family: var(--font-sans); }
185-
@utility text-display-sm { font-size:3.6rem; font-weight:300; line-height:4.4rem; font-family: var(--font-sans); }
183+
@utility text-display-lg { font-size:5.7rem; font-family: var(--font-sans); }
184+
@utility text-display-md { font-size:5.2rem; font-family: var(--font-sans); }
185+
@utility text-display-sm { font-size:3.6rem; font-family: var(--font-sans); }
186+
187+
@utility text-headline-lg { font-size:3.2rem; font-family: var(--font-sans); }
188+
@utility text-headline-md { font-size:2.8rem; font-family: var(--font-sans); }
189+
@utility text-headline-sm { font-size:2.4rem; font-family: var(--font-sans); }
186190

187-
@utility text-headline-lg { font-size:3.2rem; font-weight:200; line-height:4rem; font-family: var(--font-sans); }
188-
@utility text-headline-md { font-size:2.8rem; font-weight:200; line-height:3.2rem; font-family: var(--font-sans); }
189-
@utility text-headline-sm { font-size:2.4rem; font-weight:200; line-height:3.2rem; font-family: var(--font-sans); }
191+
@utility text-title-lg { font-size:2.2rem; font-family: var(--font-sans); }
192+
@utility text-title-md { font-size:1.6rem; font-family: var(--font-sans); }
193+
@utility text-title-sm { font-size:1.4rem; font-family: var(--font-sans); }
190194

191-
@utility text-title-lg { font-size:2.2rem; font-weight:400; line-height:1.75rem; font-family: var(--font-sans); }
192-
@utility text-title-md { font-size:1.6rem; font-weight:400; line-height:2.4rem; letter-spacing:0.015rem; font-family: var(--font-sans); }
193-
@utility text-title-sm { font-size:1.4rem; font-weight:400; line-height:2rem; letter-spacing:0.01rem; font-family: var(--font-sans); }
195+
@utility text-label-lg { font-size:1.4rem; font-family: var(--font-sans); }
196+
@utility text-label-md { font-size:1.2rem; font-family: var(--font-sans); }
197+
@utility text-label-sm { font-size:1.1rem; font-family: var(--font-sans); }
194198

195-
@utility text-label-lg { font-size:1.4rem; font-weight:300; line-height:2rem; font-family: var(--font-sans); }
196-
@utility text-label-md { font-size:1.2rem; font-weight:300; line-height:1.6rem; font-family: var(--font-sans); }
197-
@utility text-label-sm { font-size:1.1rem; font-weight:300; line-height:1.6rem; font-family: var(--font-sans); }
199+
@utility text-body-lg { font-size:1.4rem; font-family: var(--font-sans); }
200+
@utility text-body-md { font-size:1.2rem; font-family: var(--font-sans); }
201+
@utility text-body-sm { font-size:1rem; font-family: var(--font-sans); }
198202

199203
/* JEN Serif */
200-
@utility text-display-serif { font-size:3.6rem; font-weight:200; line-height:4.6rem; letter-spacing:0.6rem; font-family: var(--font-serif); }
201-
@utility text-headline-lg-serif { font-size:3.2rem; font-weight:200; line-height:4rem; letter-spacing:0.2rem; font-family: var(--font-serif); }
202-
@utility text-headline-md-serif { font-size:2.4rem; font-weight:200; line-height:3.2rem; letter-spacing:0.2rem; font-family: var(--font-serif); }
203-
@utility text-headline-sm-serif { font-size:2rem; font-weight:200; line-height:2.4rem; letter-spacing:1.2rem; font-family: var(--font-serif); }
204-
@utility text-label-serif { font-size:1.4rem; font-weight:200; line-height:2rem; letter-spacing:0.4rem; font-family: var(--font-serif); }
204+
@utility text-display-serif { font-size:3.6rem; font-family: var(--font-serif); }
205+
@utility text-headline-lg-serif { font-size:3.2rem; font-family: var(--font-serif); }
206+
@utility text-headline-md-serif { font-size:2.4rem; font-family: var(--font-serif); }
207+
@utility text-headline-sm-serif { font-size:2rem; font-family: var(--font-serif); }
208+
@utility text-label-serif { font-size:1.4rem; font-family: var(--font-serif); }
205209

206210
/* Layout */
207211
@utility layout-flex { display: var(--display-flex); }
208212
@utility layout-grid { display: var(--display-grid); }
213+
@utility layout-block { display: var(--display-block); }
214+
@utility layout-inline { display: var(--display-inline); }
209215

210216
@utility grid-cols-6 { grid-template-columns: var(--grid-cols-6); }
211217
@utility grid-cols-4 { grid-template-columns: var(--grid-cols-4); }

0 commit comments

Comments
 (0)