Skip to content

Commit

Permalink
Design/#98 update board (#99)
Browse files Browse the repository at this point in the history
* design: 폰트 및 글자 크기 수정

* design: 제목 수정 시 textarea 적용
  • Loading branch information
birdieHyun authored Dec 21, 2023
1 parent 894f96e commit bc9285c
Show file tree
Hide file tree
Showing 13 changed files with 177 additions and 40 deletions.
14 changes: 14 additions & 0 deletions src/assets/global.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
.no-scroll {
position: fixed;
}

@font-face {
font-family: 'Pretendard-Regular';
src: url('https://cdn.jsdelivr.net/gh/Project-Noonnu/[email protected]/Pretendard-Regular.woff') format('woff');
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: 'GmarketSansMedium';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/GmarketSansMedium.woff') format('woff');
font-weight: normal;
font-style: normal;
}
10 changes: 10 additions & 0 deletions src/components/application/ApplyTerm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,14 @@ button {
}
}
h1{
font-family: 'GmarketSansMedium', sans-serif;
font-weight: bold;
}
h2{
font-family: 'GmarketSansMedium', sans-serif;
font-weight: bold;
}
</style>
6 changes: 6 additions & 0 deletions src/components/application/NotApplyTerm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,10 @@ h1 {
input {
outline: none;
}
h1{
font-family: 'GmarketSansMedium', sans-serif;
font-weight: bold;
}
</style>
29 changes: 19 additions & 10 deletions src/components/applyinfo/ApplyPeriod.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
</h1>
<div class="container">
<div class="text-box">
서류 접수
&nbsp;&nbsp;&nbsp;&nbsp;
<apply-title>서류 접수</apply-title>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
{{ applicationDates.startDate }} ~ {{ applicationDates.endDate }}
<br><br>

서류 합격 발표
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<apply-title>서류 합격 발표</apply-title>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
{{ applicationDates.firstResultDate }}
<br><br>

면접
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<apply-title>면접</apply-title>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
{{ applicationDates.interviewStartDate }} ~ {{ applicationDates.interviewEndDate }}
<br><br>

최종 결과 발표
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<apply-title>최종 결과 발표</apply-title>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
{{ applicationDates.finalResultDate }}
<br><br>

오리엔테이션
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<apply-title>오리엔테이션</apply-title>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
{{ applicationDates.orientationDate }}
<br><br>
</div>
Expand Down Expand Up @@ -68,13 +68,17 @@ export default {
h1 {
color: #143673;
font-family: 'GmarketSansMedium', sans-serif;
}
.container {
display: flex;
justify-content: center; /* 가로 중앙 정렬 */
margin-top: 30px;
margin-bottom: 100px;
font-family: 'Pretendard-Regular', sans-serif;
}
.text-box {
Expand All @@ -86,6 +90,11 @@ h1 {
height: 95%;
text-align: center;
border-radius: 20px;
font-size: 16px;
}
apply-title {
font-size: 16px;
font-weight: bold;
}
</style>
7 changes: 7 additions & 0 deletions src/components/applyinfo/ApplyQualification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,19 @@ export default {}
h1 {
margin-top: 100px;
color: #143673;
font-family: 'GmarketSansMedium', sans-serif;
}
.container {
margin-top: 30px;
display: flex;
justify-content: center;
margin-bottom: 100px;
font-family: 'Pretendard-Regular', sans-serif;
}
.text-box {
Expand All @@ -57,4 +63,5 @@ h1 {
padding: 1vh;
padding-left: 4vh;
}
</style>
7 changes: 6 additions & 1 deletion src/components/board/BoardDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<option value="FREE">자유게시판</option>
</select>
<br>
<input @input="validTitle" type="text" v-model="editedTitle" class="edit-title">
<textarea @input="validTitle" v-model="editedTitle" class="edit-title"></textarea>
</div>

<div v-if="boardData" class="board-user"> {{ boardData.writer }}</div>
Expand Down Expand Up @@ -425,6 +425,7 @@ span {
textarea {
width: 100%;
height: 300px;
padding: 10px;
margin-bottom: 10px;
border: 1px solid #ddd;
Expand Down Expand Up @@ -493,4 +494,8 @@ textarea {
}
}
.edit-title{
height: 20px;
}
</style>
7 changes: 6 additions & 1 deletion src/components/board/admin/BoardTemplateDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p v-if="templateData" class="detail-title"> {{ templateData.title }} </p>
</div>
<div v-else>
<input @input="validTitle" type="text" v-model="editedTitle" class="edit-title">
<textarea @input="validTitle" type="text" v-model="editedTitle" class="edit-title"></textarea>
</div>


Expand Down Expand Up @@ -255,6 +255,7 @@ span {
textarea {
width: 100%;
height: 500px;
padding: 10px;
margin-bottom: 10px;
border: 1px solid #ddd;
Expand Down Expand Up @@ -332,4 +333,8 @@ button{
border: none;
}
.edit-title{
height: 20px;
}
</style>
5 changes: 5 additions & 0 deletions src/components/common/CommonHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ export default {


<style>
li{
font-size: 16px;
}
.header-container {
display: flex;
align-items: center;
Expand Down
77 changes: 61 additions & 16 deletions src/components/home/ClubActivityIntroduction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,70 @@
<div class="card-container">

<div class="card grey-card">
<img src="https://yg-img-storage.s3.ap-northeast-2.amazonaws.com/image/rounding.476519da.jpg" alt="정규 활동" class="introduction-image">
<img src="https://yg-img-storage.s3.ap-northeast-2.amazonaws.com/image/rounding.476519da.jpg" alt="정규 활동"
class="introduction-image">
</div>
<div class="card">
<span>정규 활동 <br><br>
매주 목요일 신촌역 부근에서<br>
정기활동을 진행해요 </span>
<span>
<main-title>
정규 활동<br><br>
</main-title>
<main-body>
매주 목요일 신촌역 부근에서<br>
정기활동을 진행해요
</main-body>
</span>
</div>

<div class="card grey-card">
<img src="https://yg-img-storage.s3.ap-northeast-2.amazonaws.com/image/new-comer.efdadda2.jpg" alt="신입 환영 MT" class="introduction-image">
<img src="https://yg-img-storage.s3.ap-northeast-2.amazonaws.com/image/new-comer.efdadda2.jpg" alt="신입 환영 MT"
class="introduction-image">
</div>
<div class="card">
<span>신입 환영 MT<br><br>
신입 부원들과 기존 부원들과의 조화를 위해<br>
신입 환영 MT를 진행해요</span>
<span>
<main-title>
신입 환영 MT<br><br>
</main-title>

<main-body>
신입 부원들과 기존 부원들과의 조화를 위해<br>
신입 환영 MT를 진행해요</main-body>
</span>
</div>

<div class="card grey-card">
<img src="https://yg-img-storage.s3.ap-northeast-2.amazonaws.com/image/%E1%84%89%E1%85%B3%E1%84%8F%E1%85%B3%E1%84%85%E1%85%B5%E1%86%AB%E1%84%89%E1%85%A3%E1%86%BA+2023-11-16+%E1%84%8B%E1%85%A9%E1%84%92%E1%85%AE+9.58.19.png" alt="단체 라운딩" class="introduction-image">
<img
src="https://yg-img-storage.s3.ap-northeast-2.amazonaws.com/image/%E1%84%89%E1%85%B3%E1%84%8F%E1%85%B3%E1%84%85%E1%85%B5%E1%86%AB%E1%84%89%E1%85%A3%E1%86%BA+2023-11-16+%E1%84%8B%E1%85%A9%E1%84%92%E1%85%AE+9.58.19.png"
alt="단체 라운딩" class="introduction-image">
</div>
<div class="card">
<span>단체 라운딩<br><br>
매 학기 경기권에서 라운딩을 진행해요</span>
<span>
<main-title>
단체 라운딩<br><br>
</main-title>

<main-body>
매 학기 경기권에서 라운딩을 진행해요
</main-body>
</span>
</div>

<div class="card grey-card">
<img src="https://yg-img-storage.s3.ap-northeast-2.amazonaws.com/image/%E1%84%89%E1%85%B3%E1%84%8F%E1%85%B3%E1%84%85%E1%85%B5%E1%86%AB%E1%84%89%E1%85%A3%E1%86%BA+2023-11-16+%E1%84%8B%E1%85%A9%E1%84%92%E1%85%AE+9.57.21.png" alt="OB 엠티" class="introduction-image">
<img
src="https://yg-img-storage.s3.ap-northeast-2.amazonaws.com/image/%E1%84%89%E1%85%B3%E1%84%8F%E1%85%B3%E1%84%85%E1%85%B5%E1%86%AB%E1%84%89%E1%85%A3%E1%86%BA+2023-11-16+%E1%84%8B%E1%85%A9%E1%84%92%E1%85%AE+9.57.21.png"
alt="OB 엠티" class="introduction-image">
</div>
<div class="card">
<span>OB 라운딩<br><br>
YB 활동이 끝나더라도<br>
OB 부원과 라운딩을 함께해요
<span>

<main-title>
OB 라운딩<br><br>
</main-title>

<main-body>
YB 활동이 끝나더라도<br>
OB 부원과 라운딩을 함께해요
</main-body>
</span>
</div>

Expand Down Expand Up @@ -64,11 +96,16 @@ export default {
align-items: center;
text-align: center;
margin-bottom: 3%;
font-family: 'Pretendard-Regular', sans-serif;
}
h2 {
font-size: 24px;
font-size: 30px;
font-family: 'GmarketSansMedium', sans-serif;
}
.card-container {
Expand Down Expand Up @@ -106,4 +143,12 @@ h2 {
border-radius: 9px;
}
main-title {
font-size: 30px;
font-weight: bold;
}
main-body {
font-size: 20px;
}
</style>
11 changes: 8 additions & 3 deletions src/components/home/ClubIntroduction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<div class="info-container">
<h2>연골 동아리 소개</h2>
<div class="description">
연세대학교 골프동아리 연세골프는<br>
KPGA, KLPGA 투어프로<br>
연세대학교 골프동아리 연세골프는<br><br>
KPGA, KLPGA 투어프로<br><br>
이효린, 염은호, 신의경, 김재희, 서어진 프로와 함께합니다.
</div>

Expand Down Expand Up @@ -42,6 +42,8 @@ export default {
.info-container {
padding: 20px;
font-family: 'Pretendard-Regular', sans-serif;
}
h2 {
Expand All @@ -50,13 +52,16 @@ h2 {
font-weight: bold;
margin-bottom: 20px;
text-align: center;
font-family: 'GmarketSansMedium', sans-serif;
}
.description {
padding: 15px;
border-radius: 10px;
margin-bottom: 20px;
text-align: center;
font-size: 20px;
}
.statistic-cards {
Expand All @@ -79,6 +84,6 @@ h2 {
.data {
font-weight: bold;
font-size: 18px;
font-size: 30px;
}
</style>
Loading

0 comments on commit bc9285c

Please sign in to comment.