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

[SMH-81]: 'SUIT' Font 설치 및 적용 작업 #25

Merged
merged 2 commits into from
May 29, 2024
Merged

[SMH-81]: 'SUIT' Font 설치 및 적용 작업 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d07c3
[SMH-81] feat(missionary-admin/fonts): SUIT 폰트 적용
juchanhwang May 19, 2024
51d3145
[SMH-81] feat(missionary-app/fonts): SUIT 폰트 적용
juchanhwang May 19, 2024
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
3 changes: 3 additions & 0 deletions packages/missionary-admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@
},
"dependencies": {
"axios": "^1.6.8"
},
"devDependencies": {
"sass": "^1.75.0"
}
}
Binary file added packages/missionary-admin/public/fonts/SUIT-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added packages/missionary-admin/public/fonts/SUIT-ExtraBold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added packages/missionary-admin/public/fonts/SUIT-ExtraLight.woff2
View file
Open in desktop
Binary file not shown.
Binary file added packages/missionary-admin/public/fonts/SUIT-Heavy.woff2
View file
Open in desktop
Binary file not shown.
Binary file added packages/missionary-admin/public/fonts/SUIT-Light.woff2
View file
Open in desktop
Binary file not shown.
Binary file added packages/missionary-admin/public/fonts/SUIT-Medium.woff2
View file
Open in desktop
Binary file not shown.
Binary file added packages/missionary-admin/public/fonts/SUIT-Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file added packages/missionary-admin/public/fonts/SUIT-SemiBold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added packages/missionary-admin/public/fonts/SUIT-Thin.woff2
View file
Open in desktop
Binary file not shown.
19 changes: 9 additions & 10 deletions packages/missionary-admin/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import '@styles/_global.scss';
import type { Metadata } from 'next';

import { EmotionProvider } from '../lib/EmotionProvider';

export const metadata: Metadata = {
title: '선교 상륙 작전',
};

export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
const RootLayout = ({ children }: { children: React.ReactNode }) => {
return (
<html lang="en">
<EmotionProvider>
<body>{children}</body>
</EmotionProvider>
</html>
);
}
};

export default RootLayout;

export const metadata: Metadata = {
title: '선교 상륙 작전',
};
1 change: 1 addition & 0 deletions packages/missionary-admin/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './styles/_global.scss';
11 changes: 2 additions & 9 deletions packages/missionary-admin/src/lib/EmotionProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,8 @@

import { ThemeProvider } from '@emotion/react';

import { GlobalStyle } from '@/styles/Global';

import { theme } from '../styles/theme';
import { theme } from '@styles/theme';

export function EmotionProvider({ children }: { children: React.ReactNode }) {
return (
<ThemeProvider theme={theme}>
<GlobalStyle />
{children}
</ThemeProvider>
);
return <ThemeProvider theme={theme}>{children}</ThemeProvider>;
}
143 changes: 0 additions & 143 deletions packages/missionary-admin/src/styles/Global.tsx
View file
Open in desktop

This file was deleted.

57 changes: 57 additions & 0 deletions packages/missionary-admin/src/styles/_font.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
@font-face {
font-family: 'SUIT';
font-weight: 100;
src: url('/fonts/SUIT-Thin.woff2') format('woff2');
}

@font-face {
font-family: 'SUIT';
font-weight: 200;
src: url('/fonts/SUIT-ExtraLight.woff2') format('woff2');
}

@font-face {
font-family: 'SUIT';
font-weight: 300;
src: url('/fonts/SUIT-Light.woff2') format('woff2');
}

@font-face {
font-family: 'SUIT';
font-weight: 400;
src: url('/fonts/SUIT-Regular.woff2') format('woff2');
}

@font-face {
font-family: 'SUIT';
font-weight: 500;
src: url('/fonts/SUIT-Medium.woff2') format('woff2');
}

@font-face {
font-family: 'SUIT';
font-weight: 600;
src: url('/fonts/SUIT-SemiBold.woff2') format('woff2');
}

@font-face {
font-family: 'SUIT';
font-weight: 700;
src: url('/fonts/SUIT-Bold.woff2') format('woff2');
}

@font-face {
font-family: 'SUIT';
font-weight: 800;
src: url('/fonts/SUIT-ExtraBold.woff2') format('woff2');
}

@font-face {
font-family: 'SUIT';
font-weight: 900;
src: url('/fonts/SUIT-Heavy.woff2') format('woff2');
}

body {
font-family: 'SUIT', sans-serif;
}
2 changes: 2 additions & 0 deletions packages/missionary-admin/src/styles/_global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@use "./_reset";
@use "./_font";
Loading
Loading