diff --git a/src/assets/global.css b/src/assets/global.css index 8154247..8d91c63 100644 --- a/src/assets/global.css +++ b/src/assets/global.css @@ -1,3 +1,17 @@ .no-scroll { position: fixed; +} + +@font-face { + font-family: 'Pretendard-Regular'; + src: url('https://cdn.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'GmarketSansMedium'; + src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff'); + font-weight: normal; + font-style: normal; } \ No newline at end of file diff --git a/src/components/application/ApplyTerm.vue b/src/components/application/ApplyTerm.vue index 989e91d..a817391 100644 --- a/src/components/application/ApplyTerm.vue +++ b/src/components/application/ApplyTerm.vue @@ -48,4 +48,14 @@ button { } } +h1{ + font-family: 'GmarketSansMedium', sans-serif; + font-weight: bold; +} + +h2{ + font-family: 'GmarketSansMedium', sans-serif; + font-weight: bold; +} + diff --git a/src/components/application/NotApplyTerm.vue b/src/components/application/NotApplyTerm.vue index e7ba165..4c6c308 100644 --- a/src/components/application/NotApplyTerm.vue +++ b/src/components/application/NotApplyTerm.vue @@ -150,4 +150,10 @@ h1 { input { outline: none; } + +h1{ + font-family: 'GmarketSansMedium', sans-serif; + font-weight: bold; +} + diff --git a/src/components/applyinfo/ApplyPeriod.vue b/src/components/applyinfo/ApplyPeriod.vue index 5bf8aa3..3a57ec6 100644 --- a/src/components/applyinfo/ApplyPeriod.vue +++ b/src/components/applyinfo/ApplyPeriod.vue @@ -4,28 +4,28 @@
- 서류 접수 -      + 서류 접수 +          {{ applicationDates.startDate }} ~ {{ applicationDates.endDate }}

- 서류 합격 발표 -                  + 서류 합격 발표 +                      {{ applicationDates.firstResultDate }}

- 면접 -             + 면접 +                 {{ applicationDates.interviewStartDate }} ~ {{ applicationDates.interviewEndDate }}

- 최종 결과 발표 -                  + 최종 결과 발표 +                      {{ applicationDates.finalResultDate }}

- 오리엔테이션 -                    + 오리엔테이션 +                        {{ applicationDates.orientationDate }}

@@ -68,6 +68,7 @@ export default { h1 { color: #143673; + font-family: 'GmarketSansMedium', sans-serif; } .container { @@ -75,6 +76,9 @@ h1 { justify-content: center; /* 가로 중앙 정렬 */ margin-top: 30px; margin-bottom: 100px; + + font-family: 'Pretendard-Regular', sans-serif; + } .text-box { @@ -86,6 +90,11 @@ h1 { height: 95%; text-align: center; border-radius: 20px; + font-size: 16px; } +apply-title { + font-size: 16px; + font-weight: bold; +} \ No newline at end of file diff --git a/src/components/applyinfo/ApplyQualification.vue b/src/components/applyinfo/ApplyQualification.vue index b2e7d44..d2783fb 100644 --- a/src/components/applyinfo/ApplyQualification.vue +++ b/src/components/applyinfo/ApplyQualification.vue @@ -32,6 +32,9 @@ export default {} h1 { margin-top: 100px; color: #143673; + + font-family: 'GmarketSansMedium', sans-serif; + } .container { @@ -39,6 +42,9 @@ h1 { display: flex; justify-content: center; margin-bottom: 100px; + + font-family: 'Pretendard-Regular', sans-serif; + } .text-box { @@ -57,4 +63,5 @@ h1 { padding: 1vh; padding-left: 4vh; } + \ No newline at end of file diff --git a/src/components/board/BoardDetail.vue b/src/components/board/BoardDetail.vue index f3970f1..854d1c1 100644 --- a/src/components/board/BoardDetail.vue +++ b/src/components/board/BoardDetail.vue @@ -12,7 +12,7 @@
- +
{{ boardData.writer }}
@@ -425,6 +425,7 @@ span { textarea { width: 100%; + height: 300px; padding: 10px; margin-bottom: 10px; border: 1px solid #ddd; @@ -493,4 +494,8 @@ textarea { } } + +.edit-title{ + height: 20px; +} \ No newline at end of file diff --git a/src/components/board/admin/BoardTemplateDetail.vue b/src/components/board/admin/BoardTemplateDetail.vue index 0986077..34cb8a0 100644 --- a/src/components/board/admin/BoardTemplateDetail.vue +++ b/src/components/board/admin/BoardTemplateDetail.vue @@ -6,7 +6,7 @@

{{ templateData.title }}

- +
@@ -255,6 +255,7 @@ span { textarea { width: 100%; + height: 500px; padding: 10px; margin-bottom: 10px; border: 1px solid #ddd; @@ -332,4 +333,8 @@ button{ border: none; } +.edit-title{ + height: 20px; +} + \ No newline at end of file diff --git a/src/components/common/CommonHeader.vue b/src/components/common/CommonHeader.vue index 32d4745..1d21e13 100644 --- a/src/components/common/CommonHeader.vue +++ b/src/components/common/CommonHeader.vue @@ -115,6 +115,11 @@ export default { diff --git a/src/components/home/ClubIntroduction.vue b/src/components/home/ClubIntroduction.vue index 63d95c3..c273f88 100644 --- a/src/components/home/ClubIntroduction.vue +++ b/src/components/home/ClubIntroduction.vue @@ -4,8 +4,8 @@

연골 동아리 소개

- 연세대학교 골프동아리 연세골프는
- KPGA, KLPGA 투어프로
+ 연세대학교 골프동아리 연세골프는

+ KPGA, KLPGA 투어프로

이효린, 염은호, 신의경, 김재희, 서어진 프로와 함께합니다.
@@ -42,6 +42,8 @@ export default { .info-container { padding: 20px; + font-family: 'Pretendard-Regular', sans-serif; + } h2 { @@ -50,6 +52,8 @@ h2 { font-weight: bold; margin-bottom: 20px; text-align: center; + + font-family: 'GmarketSansMedium', sans-serif; } .description { @@ -57,6 +61,7 @@ h2 { border-radius: 10px; margin-bottom: 20px; text-align: center; + font-size: 20px; } .statistic-cards { @@ -79,6 +84,6 @@ h2 { .data { font-weight: bold; - font-size: 18px; + font-size: 30px; } diff --git a/src/components/home/ContactInfo.vue b/src/components/home/ContactInfo.vue index 7bad93d..efb9e3b 100644 --- a/src/components/home/ContactInfo.vue +++ b/src/components/home/ContactInfo.vue @@ -4,13 +4,13 @@

지금 바로 함께 해요

상세 문의사항
-   회장  : {{ leader.name }} {{ leader.phoneNumber }} +   회장  : {{ leader.name }} {{ leader.phoneNumber }}
- 부회장 :{{ assistant.name }} {{ assistant.phoneNumber }} + 부회장  : {{ assistant.name }} {{ assistant.phoneNumber }}
-
자세히 둘러보기
+

자세히 둘러보기

INSTAGRAM : @yonsei__golf @@ -69,22 +69,25 @@ export default { max-width: 600px; margin: 0 auto; padding: 20px; - font-family: 'Noto Sans KR', sans-serif; text-align: center; + + font-family: 'Pretendard-Regular', sans-serif; } h1 { font-size: 32px; margin-bottom: 30px; color: #143673; - font-weight: 500; + font-weight: bold; + + font-family: 'GmarketSansMedium', sans-serif; } .contact-detail { font-size: 20px; margin-top: 20px; margin-bottom: 20px; - font-weight: 400; + font-weight: bold; color: #4d4d4d; } @@ -142,4 +145,13 @@ a{ } } +.contact-main{ + font-size: 30px; + font-weight: bold; +} + +leaders{ + font-size: 16px; + font-weight: bold; +} \ No newline at end of file diff --git a/src/components/qna/QnA.vue b/src/components/qna/QnA.vue index ba203c2..6a83b20 100644 --- a/src/components/qna/QnA.vue +++ b/src/components/qna/QnA.vue @@ -7,19 +7,19 @@

@@ -66,6 +66,10 @@ export default { \ No newline at end of file diff --git a/src/main.js b/src/main.js index 747e75a..dc60776 100644 --- a/src/main.js +++ b/src/main.js @@ -6,6 +6,7 @@ import store from './store'; import './assets/global.css'; import Vue3Toast from 'vue3-toastify' import axios from "axios"; +import './assets/global.css'; async function initializeApp() {