Merge pull request #1013 from 42organization/GGFE-251-폰트-정리

[GGFE-251] 폰트 정리

components/admin/Layout.tsx

@@ -1,4 +1,5 @@
 import Link from 'next/link';
+import { ThemeProvider, createTheme } from '@mui/material';
 import SideNav from 'components/admin/SideNav';
 import useAxiosWithToast from 'hooks/useAxiosWithToast';
 import styles from 'styles/admin/Layout.module.scss';
@@ -7,23 +8,31 @@ type AdminLayoutProps = {
   children: React.ReactNode;
 };
 
+const theme = createTheme({
+  typography: {
+    fontFamily: "'Pretendard-Medium'', sans-serif", // $common-font
+  },
+});
+
 export default function AdminLayout({ children }: AdminLayoutProps) {
   useAxiosWithToast();
 
   return (
-    <div className={styles.adminContainer}>
-      <div className={styles.header}>
-        <Link href='/admin'>
-          <div className={styles.title}>관리자 페이지</div>
-        </Link>
-        <Link href='/'>
-          <button className={styles.homeButton}>Home</button>
-        </Link>
-      </div>
-      <div className={styles.container}>
-        <SideNav />
-        <div className={styles.pageContent}>{children}</div>
+    <ThemeProvider theme={theme}>
+      <div className={styles.adminContainer}>
+        <div className={styles.header}>
+          <Link href='/admin'>
+            <div className={styles.title}>관리자 페이지</div>
+          </Link>
+          <Link href='/'>
+            <button className={styles.homeButton}>Home</button>
+          </Link>
+        </div>
+        <div className={styles.container}>
+          <SideNav />
+          <div className={styles.pageContent}>{children}</div>
+        </div>
       </div>
-    </div>
+    </ThemeProvider>
   );
 }

pages/admin/index.tsx

@@ -7,7 +7,6 @@ export default function Admin() {
         width: '100%',
         justifyContent: 'center',
         alignItems: 'center',
-        fontFamily: 'Reality Hyper Regular',
         fontSize: '2rem',
       }}
     >

styles/Error.module.scss

@@ -29,14 +29,11 @@
 }
 
 .title {
-  font-family: 'Overgrow';
-  font-size: 4rem;
-  color: white;
+  @include logoText(4rem, white);
   letter-spacing: 0.2rem;
 }
 
 .error {
-  font-family: 'NanumSquare_acR';
   font-size: $big-font;
   color: white;
   letter-spacing: 0.05rem;
@@ -73,7 +70,6 @@
   @include select-buttons(10rem, 3.5rem);
   .positive {
     input {
-      font-family: 'NanumSquare_acR';
       font-size: $big-font;
       font-weight: 500;
       box-shadow: 1px 1px 0px 0px rgba(0, 0, 0, 0.2);

styles/Layout/Header.module.scss

@@ -24,12 +24,11 @@
 }
 
 .logoWrap {
+  @include logoText(2rem, white);
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
-  font-family: 'Overgrow', sans-serif;
-  font-size: 2rem;
   cursor: pointer;
 }
 
@@ -82,7 +81,7 @@
 }
 
 .notiCount {
-  font-family: 'Roboto', sans-serif;
+  font-family: $common-en-font;
   font-size: 0.7rem;
   font-weight: 400;
 }

styles/Layout/MainPageProfile.module.scss

@@ -6,7 +6,7 @@
   height: max-content;
   flex-direction: column;
   margin-top: 0.8rem;
-  font-family: 'Roboto', 'sans-serif';
+  font-family: $common-en-font;
   justify-content: center;
   align-items: center;
 }

styles/Layout/MenuBar.module.scss

@@ -17,8 +17,7 @@
     align-items: center;
     padding-right: 1.8rem;
     .menuLogo {
-      font-family: 'Overgrow', sans-serif;
-      font-size: 1.8rem;
+      @include logoText(1.8rem, black);
     }
     button {
       all: unset;
@@ -36,7 +35,7 @@
     width: 100%;
     padding-top: 2rem;
     padding-bottom: 2rem;
-    font-family: 'Roboto', sans-serif;
+    font-family: $common-en-font;
     .userInfoWrapper {
       display: flex;
       flex-direction: column;
@@ -105,7 +104,7 @@
       align-items: center;
     }
     .menuText {
-      font-family: 'Fira Sans', sans-serif;
+      // font-family: 'Fira Sans', sans-serif;
       font-size: 1rem;
       font-weight: 500;
       color: rgba(26, 30, 37, 1);
@@ -130,7 +129,7 @@
     }
     div {
       padding-right: 0.375rem;
-      font-family: 'Fira Sans', sans-serif;
+      // font-family: 'Fira Sans', sans-serif;
       font-size: 1rem;
       font-weight: 600;
       color: rgba(26, 30, 37, 1);

styles/Layout/NotiBar.module.scss

@@ -51,7 +51,7 @@
     .deleteButton {
       display: flex;
       padding: 0.5rem 1rem;
-      font-family: 'Heebo', sans-serif;
+      // font-family: 'Heebo', sans-serif;
       font-size: 0.8rem;
       font-weight: 500;
       color: rgba(101, 97, 102, 1);
@@ -71,10 +71,10 @@
   justify-content: center;
   align-items: center;
   padding-top: 2.8rem;
-  font-family: 'Fenix', sans-serif;
+  // font-family: 'Fenix', sans-serif;
   .notiEmptyText {
     padding-bottom: 1.25rem;
-    font-family: 'Heebo', sans-serif;
+    // font-family: 'Heebo', sans-serif;
     font-size: 1.125rem;
     font-weight: 500;
     color: rgba(141, 119, 144, 1);
@@ -99,7 +99,7 @@
   flex-direction: column;
   justify-content: flex-start;
   align-items: center;
-  font-family: 'Fenix', sans-serif;
+  // font-family: 'Fenix', sans-serif;
 }
 
 .notiDecorate {

styles/Layout/NotiItem.module.scss

@@ -56,7 +56,7 @@
 
   .date {
     display: flex;
-    font-family: 'Heebo', sans-serif;
+    // font-family: 'Heebo', sans-serif;
     font-size: 0.8rem;
     color: rgba(125, 127, 136, 1);
     justify-content: flex-end;

styles/admin/AdminReject.module.scss

@@ -34,8 +34,7 @@
 }
 
 .title {
-  font-family: 'Overgrow', sans-serif;
-  font-size: 3rem;
+  @include logoText(3rem, black);
   text-align: center;
   letter-spacing: 0.2rem;
 }

styles/admin/Layout.module.scss

@@ -23,7 +23,6 @@
 }
 
 .title {
-  font-family: $admin-font;
   font-size: $big-font;
   color: black;
   cursor: pointer;

styles/admin/SideNavContent.module.scss

@@ -18,7 +18,6 @@
 
 .contentText {
   margin-left: 0.75rem;
-  font-family: $admin-font;
   font-size: $small-font;
 }
 

styles/admin/modal/AdminCheckSendNoti.module.scss

@@ -1,3 +1,5 @@
+@import 'styles/common.scss';
+
 .whole {
   display: flex;
   width: 510px;
@@ -19,7 +21,6 @@
 .titleText {
   margin-top: 15px;
   margin-left: 1rem;
-  font-family: 'Inter';
   font-size: 28px;
   font-style: normal;
   font-weight: 500;

styles/admin/modal/AdminDeleteItem.module.scss

@@ -1,3 +1,5 @@
+@import 'styles/common.scss';
+
 .whole {
   display: flex;
   width: 510px;
@@ -19,7 +21,6 @@
 .titleText {
   margin-top: 15px;
   margin-left: 1rem;
-  font-family: 'Inter';
   font-size: 28px;
   font-style: normal;
   font-weight: 500;
@@ -54,7 +55,6 @@
   display: flex;
   width: 5rem;
   height: 3rem;
-  font-family: 'Inter';
   font-size: 0.8rem;
   font-style: normal;
   font-weight: 500;

styles/admin/modal/AdminDeleteMegaphone.module.scss

@@ -1,3 +1,5 @@
+@import 'styles/common.scss';
+
 .whole {
   display: flex;
   width: 510px;
@@ -19,7 +21,6 @@
 .titleText {
   margin-top: 15px;
   margin-left: 1rem;
-  font-family: 'Inter';
   font-size: 28px;
   font-style: normal;
   font-weight: 500;
@@ -55,7 +56,6 @@
   display: flex;
   width: 5rem;
   height: 3rem;
-  font-family: 'Inter';
   font-size: 0.8rem;
   font-style: normal;
   font-weight: 500;

styles/admin/modal/AdminDeleteProfile.module.scss

@@ -1,3 +1,5 @@
+@import 'styles/common.scss';
+
 .whole {
   display: flex;
   width: 510px;
@@ -19,7 +21,6 @@
 .titleText {
   margin-top: 15px;
   margin-left: 1rem;
-  font-family: 'Inter';
   font-size: 28px;
   font-style: normal;
   font-weight: 500;
@@ -55,7 +56,6 @@
   display: flex;
   width: 5rem;
   height: 3rem;
-  font-family: 'Inter';
   font-size: 0.8rem;
   font-style: normal;
   font-weight: 500;

styles/admin/modal/AdminEditCoinPolicy.module.scss

@@ -1,3 +1,5 @@
+@import 'styles/common.scss';
+
 .whole {
   display: flex;
   width: 510px;
@@ -19,7 +21,6 @@
 .titleText {
   margin-top: 15px;
   margin-left: 1rem;
-  font-family: 'Inter';
   font-size: 28px;
   font-style: normal;
   font-weight: 500;
@@ -54,7 +55,6 @@
 .bodyText {
   display: flex;
   width: 200px;
-  font-family: 'Inter';
   font-size: 0.8rem;
   font-style: normal;
   font-weight: 500;

styles/admin/modal/AdminEditItem.module.scss

@@ -1,3 +1,5 @@
+@import 'styles/common.scss';
+
 .whole {
   display: flex;
   width: 510px;
@@ -19,7 +21,6 @@
 .titleText {
   margin-top: 15px;
   margin-left: 1rem;
-  font-family: 'Inter';
   font-size: 28px;
   font-style: normal;
   font-weight: 500;
@@ -53,7 +54,6 @@
   display: flex;
   width: 4rem;
   height: 3rem;
-  font-family: 'Inter';
   font-size: 0.8rem;
   font-style: normal;
   font-weight: 500;

styles/admin/modal/AdminFeedbackCheck.module.scss

@@ -1,3 +1,5 @@
+@import 'styles/common.scss';
+
 .whole {
   width: 20rem;
   height: 15rem;
@@ -14,7 +16,6 @@
   text-align: center;
   .content {
     padding: 1rem 2rem;
-    font-family: 'Inter';
     font-size: 1rem;
     font-style: normal;
     font-weight: 500;

styles/admin/modal/AdminNoti.module.scss

@@ -21,7 +21,6 @@
 .titleText {
   margin-top: 15px;
   margin-left: 1rem;
-  font-family: 'Inter';
   font-size: 28px;
   font-style: normal;
   font-weight: 500;
@@ -46,7 +45,6 @@
 }
 
 .bodyText {
-  font-family: 'Inter';
   font-size: 15px;
   font-style: normal;
   font-weight: 500;

styles/admin/modal/AdminPenalty.module.scss

@@ -1,3 +1,5 @@
+@import 'styles/common.scss';
+
 .whole {
   display: flex;
   width: 510px;
@@ -19,7 +21,6 @@
 .titleText {
   margin-top: 15px;
   margin-left: 1rem;
-  font-family: 'Inter';
   font-size: 28px;
   font-style: normal;
   font-weight: 500;
@@ -46,7 +47,6 @@
 .bodyText {
   width: 67px;
   height: 27px;
-  font-family: 'Inter';
   font-size: 15px;
   font-style: normal;
   font-weight: 500;