Skip to content

global color 정의 및 폰트 추가 #6

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

Merged
Dobbymin merged 5 commits into from
Jul 14, 2025
Merged

global color 정의 및 폰트 추가 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36b3791
remove: suit 폰트 제거
Dobbymin Jul 14, 2025
696f8bf
chore: firaCode 폰트 추가
Dobbymin Jul 14, 2025
d17adac
chore: global color 추가 및 네이밍 적용
Dobbymin Jul 14, 2025
b4c012a
feat: fira code 폰트 적용
Dobbymin Jul 14, 2025
2d1d681
chore: purple 색상 추가
Dobbymin Jul 14, 2025
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 added public/fonts/FiraCode-VariableFont_wght.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed public/fonts/SUIT-Variable.woff2
View file
Open in desktop
Binary file not shown.
31 changes: 22 additions & 9 deletions src/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,17 @@
--font-sans: var(--font-geist-sans);
--font-mono: var(--font-geist-mono);
--font-pretendard: var(--font-pretendard);
--font-suit: var(--font-suit);
--font-fira-code: var(--font-fira-code);
--font-lemon: var(--font-lemon);
--color-rose-pink: var(--rose-pink);
--color-steel-gray: var(--steel-gray);
--color-light-gray: var(--light-gray);
--color-blog-pink: var(--blog-pink);
--color-blog-blue: var(--blog-blue);
--color-blog-green: var(--blog-green);
--color-blog-yellow: var(--blog-yellow);
--color-blog-gray-500: var(--blog-gray-500);
--color-blog-gray-400: var(--blog-gray-400);
--color-blog-gray-300: var(--blog-gray-300);
--color-blog-gray-200: var(--blog-gray-200);
--color-blog-gray-100: var(--blog-gray-100);
--color-sidebar-ring: var(--sidebar-ring);
--color-sidebar-border: var(--sidebar-border);
--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
Expand Down Expand Up @@ -64,9 +70,16 @@
--header-padding-x: 1rem;
--header-padding-y: 3rem;
--card: oklch(1 0 0);
--rose-pink: oklch(0.59 0.218 0.58);
--steel-gray: oklch(0.64 0.0152 248.06);
--light-gray: oklch(0.97 0.0034 247.86);
--blog-purple: oklch(0.6095 0.2382 332.15);
--blog-pink: oklch(0.5717 0.2063 13.44);
--blog-blue: oklch(0.5332 0.2106 263.54);
--blog-green: oklch(0.684 0.1136 154.11);
--blog-yellow: oklch(0.7266 0.1318 91.46);
--blog-gray-500: oklch(0.8196 0.0047 258.33);
--blog-gray-400: oklch(0.8779 0.0026 228.79);
--blog-gray-300: oklch(0.9401 0 0);
--blog-gray-200: oklch(0.9491 0 0);
Comment on lines +80 to +81

@gemini-code-assist gemini-code-assist Bot Jul 14, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The lightness values for --blog-gray-300 (oklch(0.9401 0 0)) and --blog-gray-200 (oklch(0.9491 0 0)) are extremely close. This small difference may render them visually indistinguishable on most screens. Consider adjusting one of the values to create a more noticeable contrast.

--blog-gray-100: oklch(0.9821 0 0);
--card-foreground: oklch(0.145 0 0);
--popover: oklch(1 0 0);
--popover-foreground: oklch(0.145 0 0);
Expand Down Expand Up @@ -142,9 +155,9 @@

@layer base {
* {
@apply border-border outline-ring/50 break-keep;
@apply border-border break-keep outline-ring/50;
}
body {
@apply font-pretendard flex items-center justify-center;
@apply flex items-center justify-center font-pretendard;
}
}
12 changes: 6 additions & 6 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Metadata } from 'next';
import { Geist, Geist_Mono, Lemon } from 'next/font/google';
import { Fira_Code, Geist, Geist_Mono, Lemon } from 'next/font/google';
import localFont from 'next/font/local';

import { Toaster } from '@/shared';
Expand All @@ -24,11 +24,11 @@ const pretendard = localFont({
variable: '--font-pretendard',
});

const suit = localFont({
src: '../../public/fonts/SUIT-Variable.woff2',
const firaCode = Fira_Code({
variable: '--font-fira-code',
display: 'swap',
weight: '100 900',
variable: '--font-suit',
subsets: ['latin'],
weight: ['300', '400', '500', '600', '700'],
});

const lemon = Lemon({
Expand All @@ -51,7 +51,7 @@ export default function RootLayout({
return (
<html lang='en'>
<body
className={`${geistSans.variable} ${geistMono.variable} ${lemon.variable} ${pretendard.variable} ${suit.variable} antialiased`}
className={`${geistSans.variable} ${geistMono.variable} ${pretendard.variable} ${lemon.variable} ${firaCode.variable} antialiased`}

@gemini-code-assist gemini-code-assist Bot Jul 14, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Consider using an array-based approach to construct the className string for better readability and easier management of classes.

        className={[geistSans.variable, geistMono.variable, pretendard.variable, lemon.variable, firaCode.variable, 'antialiased'].join(' ')}

>
<BlogLayout>{children}</BlogLayout>
{/* <main className='w-full items-center justify-center'></main> */}
Expand Down