Merge branch 'dev' of https://github.com/LikeLion-KNU/knufest-frontend …

…into dev
LikeLion-KNU · May 15, 2024 · 6b25c8d · 6b25c8d
2 parents 6ef5577 + 92766fd
commit 6b25c8d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,4 +39,4 @@ jobs:
 
             - name: Uploasd to S3
               run: aws s3 cp --recursive --region ap-northeast-2 dist
-                  s3://knufest2024
+                  s3://www.hapuruna.info
diff --git a/src/assets/Blinker-SemiBold.ttf b/src/assets/Blinker-SemiBold.ttf
diff --git a/src/constants/contributors.json b/src/constants/contributors.json
@@ -15,7 +15,7 @@
         "dept": "컴퓨터학부 21",
         "role": "멋쟁이사자처럼 12기 운영진",
         "photo": "hyoeun",
-        "description": ["웹 페이지 디자인", "", "기여한 부분 3"],
+        "description": ["웹 페이지 디자인", "기여한 부분 2", "기여한 부분 3"],
         "contact": {
             "instagram": "hyon__er"
         },
@@ -69,7 +69,7 @@
     },
     {
         "name": "최정식",
-        "dept": "컴퓨터학부 21",
+        "dept": "컴퓨터학부 20",
         "role": "멋쟁이사자처럼 12기 운영진",
         "photo": "jeongsik",
         "description": ["기여한 부분 1", "기여한 부분 2", "기여한 부분 3"],

diff --git a/src/pages/SpecialGuestPage.styled.tsx b/src/pages/SpecialGuestPage.styled.tsx
@@ -8,7 +8,8 @@ export const MainContent = styled.div`
     margin-top: 20px;
     position: relative;
     p {
-        text-shadow: 0px 4px 4px rgba(0, 0, 0, 25%);
+        text-shadow: 0px 2px 4px rgba(0, 0, 0, 25%);
+        font-family: "Blinker SemiBold", monospace;
     }
 `;
 export const BackImg = styled.img`

diff --git a/src/styles/globals.ts b/src/styles/globals.ts
@@ -5,7 +5,12 @@ export const GlobalStyle = createGlobalStyle`
 
   @font-face {
     font-family: "MesloLGS NF Bold";
-    src: url("./assets/MesloLGS-NF-Bold.ttf") format("truetype");
+    src: url("src/assets/MesloLGS-NF-Bold.ttf") format("truetype");
+  }
+
+  @font-face {
+    font-family: "Blinker SemiBold";
+    src: url("src/assets/Blinker-SemiBold.ttf") format("truetype");
   }
 
   body {