Merge pull request #119 from softeerbootcamp4th/hotfix

hotfix: 배경 이미지 경로 수정 및 폰트 수정
softeerbootcamp4th · Aug 23, 2024 · 009ef8e · 009ef8e
2 parents c7f0fe9 + 22a333f
commit 009ef8e
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 51 deletions.
diff --git a/packages/core/src/theme/globalStyles.ts b/packages/core/src/theme/globalStyles.ts
@@ -3,15 +3,15 @@ import { css } from "@emotion/react";
 export const globalStyles = css`
   @font-face {
     font-family: "Pretendard-Bold";
-    src: url("/fonts/pretendard/Pretendard-Bold.otf") format("opentype");
+    src: url("/fonts/pretendard/Pretendard-Bold.woff") format("woff");
   }
   @font-face {
     font-family: "Pretendard-Medium";
-    src: url("/fonts/pretendard/Pretendard-Medium.otf") format("opentype");
+    src: url("/fonts/pretendard/Pretendard-Medium.woff") format("woff");
   }
   @font-face {
     font-family: "Pretendard-SemiBold";
-    src: url("/fonts/pretendard/Pretendard-SemiBold.otf") format("opentype");
+    src: url("/fonts/pretendard/Pretendard-SemiBold.woff") format("woff");
   }
   @font-face {
     font-family: "PyeongChang-Bold";

diff --git a/packages/core/src/theme/theme.ts b/packages/core/src/theme/theme.ts
@@ -101,94 +101,94 @@ export const theme: ITheme = {
   },
   font: {
     preM: css`
-      font-family: "Pretendard-Medium";
+      font-family: "Pretendard-Medium", serif;
     `,
     preSB: css`
-      font-family: "Pretendard-SemiBold";
+      font-family: "Pretendard-SemiBold", serif;
     `,
     preB: css`
-      font-family: "Pretendard-Bold";
+      font-family: "Pretendard-Bold", serif;
     `,
 
     preM20: css`
-      font-family: "Pretendard-Medium";
+      font-family: "Pretendard-Medium", serif;
       font-size: 20px;
     `,
     preM18: css`
-      font-family: "Pretendard-Medium";
+      font-family: "Pretendard-Medium", serif;
       font-size: 18px;
     `,
     preM14: css`
-      font-family: "Pretendard-Medium";
+      font-family: "Pretendard-Medium", serif;
       font-size: 14px;
     `,
     preSB86: css`
-      font-family: "Pretendard-SemiBold";
+      font-family: "Pretendard-SemiBold", serif;
       font-size: 86px;
     `,
     preB38: css`
-      font-family: "Pretendard-Bold";
+      font-family: "Pretendard-Bold", serif;
       font-size: 38px;
     `,
     preB28: css`
-      font-family: "Pretendard-Bold";
+      font-family: "Pretendard-Bold", serif;
       font-size: 28px;
     `,
     preB24: css`
-      font-family: "Pretendard-Bold";
+      font-family: "Pretendard-Bold", serif;
       font-size: 24px;
     `,
     preB18: css`
-      font-family: "Pretendard-Bold";
+      font-family: "Pretendard-Bold", serif;
       font-size: 18px;
     `,
     preB16: css`
-      font-family: "Pretendard-Bold";
+      font-family: "Pretendard-Bold", serif;
       font-size: 16px;
     `,
 
     pcpL: css`
-      font-family: "PyeongChangPeace-Light";
+      font-family: "PyeongChangPeace-Light", serif;
     `,
     pcpB: css`
-      font-family: "PyeongChangPeace-Bold";
+      font-family: "PyeongChangPeace-Bold", serif;
     `,
     pcpL80: css`
-      font-family: "PyeongChangPeace-Light";
+      font-family: "PyeongChangPeace-Light", serif;
       font-size: 80px;
     `,
     pcpL32: css`
-      font-family: "PyeongChangPeace-Light";
+      font-family: "PyeongChangPeace-Light", serif;
       font-size: 32px;
     `,
     pcpL28: css`
-      font-family: "PyeongChangPeace-Light";
+      font-family: "PyeongChangPeace-Light", serif;
       font-size: 28px;
     `,
 
     pcpB82: css`
-      font-family: "PyeongChangPeace-Bold";
+      font-family: "PyeongChangPeace-Bold", serif;
       font-size: 82px;
     `,
     pcpB28: css`
-      font-family: "PyeongChangPeace-Bold";
+      font-family: "PyeongChangPeace-Bold", serif;
       font-size: 28px;
     `,
 
     pcB: css`
-      font-family: "PyeongChang-Bold";
+      font-family: "PyeongChang-Bold", serif;
     `,
 
     pcB40: css`
-      font-family: "PyeongChang-Bold";
+      font-family: "PyeongChang-Bold", serif;
       font-size: 40px;
     `,
     pcB28: css`
-      font-family: "PyeongChang-Bold";
+      font-family: "PyeongChang-Bold", serif;
       font-size: 28px;
     `,
     pcB16: css`
-      font-family: "PyeongChang-Bold";
+      font-family: "PyeongChang-Bold", serif;
       font-size: 16px;
     `,
   },

diff --git a/packages/service/public/fonts/pretendard/Pretendard-Bold.otf b/packages/service/public/fonts/pretendard/Pretendard-Bold.otf
diff --git a/packages/service/public/fonts/pretendard/Pretendard-Bold.woff b/packages/service/public/fonts/pretendard/Pretendard-Bold.woff
diff --git a/packages/service/public/fonts/pretendard/Pretendard-Medium.otf b/packages/service/public/fonts/pretendard/Pretendard-Medium.otf
diff --git a/packages/service/public/fonts/pretendard/Pretendard-Medium.woff b/packages/service/public/fonts/pretendard/Pretendard-Medium.woff
diff --git a/packages/service/public/fonts/pretendard/Pretendard-SemiBold.otf b/packages/service/public/fonts/pretendard/Pretendard-SemiBold.otf
diff --git a/packages/service/public/fonts/pretendard/Pretendard-SemiBold.woff b/packages/service/public/fonts/pretendard/Pretendard-SemiBold.woff
diff --git a/packages/service/src/common/components/Button/Button.css.ts b/packages/service/src/common/components/Button/Button.css.ts
@@ -73,9 +73,9 @@ export const smallDarkButtonStyle = css`
 
 export const smallLightButtonStyle = css`
   ${theme.flex.center}
-  ${theme.font.preM20}
+  ${theme.font.preB}
+  font-size: 20;
   color: ${theme.color.black};
-  font-weight: 600;
   background: ${theme.color.white};
   width: 180px;
   height: 52px;
@@ -102,7 +102,6 @@ export const hugeButtonStyle = css`
   width: 597px;
   height: 115px;
   padding: 35px 138px;
-  font-weight: 700;
   gap: 10px;
   flex-shrink: 0;
   border: none;

diff --git a/packages/service/src/common/components/ClipBoardButton/ClipBoardButton.css.ts b/packages/service/src/common/components/ClipBoardButton/ClipBoardButton.css.ts
@@ -8,7 +8,6 @@ export const clipButtonStyle = css`
   width: 265px;
   height: 50px;
   padding: 9px 57px;
-  font-weight: 500;
   gap: 10px;
   flex-shrink: 0;
   border-radius: 8px;
@@ -40,15 +39,13 @@ export const clipButtonContentStyle = css`
   ${theme.flex.center}
   ${theme.font.preB18}
   color: ${theme.color.black};
-  font-weight: 500;
   gap: 10px;
 `;
 
 export const clipButtonSuccessContentStyle = css`
   ${theme.flex.center}
   ${theme.font.preB18}
   color: ${theme.color.eventBlue};
-  font-weight: 500;
   gap: 10px;
   rect {
     stroke: ${theme.color.eventBlue};

diff --git a/packages/service/src/components/main/EventCard/EventCard.css.ts b/packages/service/src/components/main/EventCard/EventCard.css.ts
@@ -34,7 +34,7 @@ export const eventNumber = css`
 `;
 
 export const eventTitle = css`
-  ${theme.font.pcpB};
+  ${theme.font.preB};
   ${theme.margin.mg12}
   font-size: 30px;
 

diff --git a/packages/service/src/pages/Error/Error.css.ts b/packages/service/src/pages/Error/Error.css.ts
@@ -2,8 +2,7 @@ import { css } from "@emotion/react";
 import { theme } from "@watermelon-clap/core/src/theme";
 
 export const errorContainerStyle = css`
-  background-image: url("/images/common/main-bg.webp"),
-    url("/images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   background-position: center;
 

diff --git a/packages/service/src/pages/Loading/Loading.css.ts b/packages/service/src/pages/Loading/Loading.css.ts
@@ -2,8 +2,7 @@ import { css } from "@emotion/react";
 import { theme } from "@watermelon-clap/core/src/theme";
 
 export const loadingStyle = css`
-  background-image: url("/images/common/main-bg.webpg"),
-    url("images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   background-position: center;
 

diff --git a/packages/service/src/pages/LotteryApplyFinish/LotteryApplyFinish.css.ts b/packages/service/src/pages/LotteryApplyFinish/LotteryApplyFinish.css.ts
@@ -3,8 +3,7 @@ import { mobile } from "@service/common/responsive/responsive";
 import { theme } from "@watermelon-clap/core/src/theme";
 
 export const mainBg = css`
-  background-image: url("/images/common/main-bg.webp"),
-    url("/images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   padding-bottom: 200px;
 

diff --git a/packages/service/src/pages/LotteryApplyInfo/LotteryApplyInfo.css.ts b/packages/service/src/pages/LotteryApplyInfo/LotteryApplyInfo.css.ts
@@ -3,8 +3,7 @@ import { mobile } from "@service/common/responsive/responsive";
 import { theme } from "@watermelon-clap/core/src/theme";
 
 export const mainBg = css`
-  background-image: url("/images/common/main-bg.webp"),
-    url("/images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   padding-bottom: 200px;
   min-height: calc(100vh - 356px);

diff --git a/packages/service/src/pages/Main/Main.css.ts b/packages/service/src/pages/Main/Main.css.ts
@@ -2,8 +2,7 @@ import { css } from "@emotion/react";
 import { mobile } from "@service/common/responsive/responsive";
 
 export const mainBg = css`
-  background-image: url("images/common/main-bg.webp"),
-    url("images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   padding-bottom: 200px;
 

diff --git a/packages/service/src/pages/PartsCollection/PartsCollection.css.ts b/packages/service/src/pages/PartsCollection/PartsCollection.css.ts
@@ -3,8 +3,7 @@ import { mobile } from "@service/common/responsive/responsive";
 import { theme } from "@watermelon-clap/core/src/theme";
 
 export const mainBg = css`
-  background-image: url("/images/common/main-bg.webp"),
-    url("/images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   padding: 0 5%;
   padding-bottom: 100px;

diff --git a/packages/service/src/pages/PartsPick/PartsPick.css.ts b/packages/service/src/pages/PartsPick/PartsPick.css.ts
@@ -3,8 +3,7 @@ import { mobile } from "@service/common/responsive/responsive";
 import { theme } from "@watermelon-clap/core/src/theme";
 
 export const partsPickBackgroundStyle = css`
-  background-image: url("/images/common/main-bg.webp"),
-    url("/images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   background-position: center;
 

diff --git a/packages/service/src/pages/PickEvent/PickEvent.css.ts b/packages/service/src/pages/PickEvent/PickEvent.css.ts
@@ -3,8 +3,7 @@ import { mobile } from "@service/common/responsive/responsive";
 import { theme } from "@watermelon-clap/core/src/theme";
 
 export const bg = css`
-  background-image: url("images/common/main-bg.webp"),
-    url("images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   padding-top: 54px;
   padding-bottom: 200px;

diff --git a/packages/service/src/pages/Share/Share.css.ts b/packages/service/src/pages/Share/Share.css.ts
@@ -4,8 +4,7 @@ import { SHARE_BREAKPOINT } from "@service/constants/breakpoints";
 import { theme } from "@watermelon-clap/core/src/theme";
 
 export const mainBg = css`
-  background-image: url("/images/common/main-bg.webp"),
-    url("/images/common/main-bg.webp");
+  background-image: url("/images/common/main-bg.webp");
   background-size: cover;
   padding-bottom: 200px;