Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat] #10 Add Pretendard font and update Tailwind configuration #11

Merged
merged 1 commit into from
Oct 9, 2024
Merged

[feat] #10 Add Pretendard font and update Tailwind configuration #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed fe/src/public/fonts/GeistMonoVF.woff
View file
Open in desktop
Binary file not shown.
Binary file removed fe/src/public/fonts/GeistVF.woff
View file
Open in desktop
Binary file not shown.
Binary file added fe/src/public/fonts/PretendardVariable.woff2
View file
Open in desktop
Binary file not shown.
29 changes: 8 additions & 21 deletions fe/src/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,14 @@
@font-face {
font-family: 'Pretendard';
src: url('/fonts/PretendardVariable.woff2') format('woff2');
font-weight: 100 900;
font-style: normal;
}

@tailwind base;
@tailwind components;
@tailwind utilities;

:root {
--background: #ffffff;
--foreground: #171717;
}

@media (prefers-color-scheme: dark) {
:root {
--background: #0a0a0a;
--foreground: #ededed;
}
}

body {
color: var(--foreground);
background: var(--background);
font-family: Arial, Helvetica, sans-serif;
}

@layer utilities {
.text-balance {
text-wrap: balance;
}
font-family: 'Pretendard', sans-serif;
}
7 changes: 6 additions & 1 deletion fe/tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Config } from "tailwindcss";
import type { Config } from 'tailwindcss';

const config: Config = {
content: [
Expand Down Expand Up @@ -94,6 +94,11 @@ const config: Config = {
300: '300',
},

// Pretendard 폰트 추가
fontFamily: {
'pretendard': ['Pretendard', 'sans-serif'],
},

// 모서리 반경 설정
borderRadius: {
'xxsmall': '4px',
Expand Down
Loading