Skip to content

Commit 268ff2f

Browse files
bamcasabamcasa
authored
Merge pull request #1 from moyeothon/main
수정본
2 parents 018d1b8 + d31c76c commit 268ff2f

File tree

3 files changed

+86
-16
lines changed

3 files changed

+86
-16
lines changed

‎.github/workflows/jekyll-gh-pages.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
2+
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
push:
7+
branches: ["main"]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
19+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
20+
concurrency:
21+
group: "pages"
22+
cancel-in-progress: false
23+
24+
jobs:
25+
# Build job
26+
build:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@v4
31+
- name: Setup Pages
32+
uses: actions/configure-pages@v5
33+
- name: Build with Jekyll
34+
uses: actions/jekyll-build-pages@v1
35+
with:
36+
source: ./
37+
destination: ./_site
38+
- name: Upload artifact
39+
uses: actions/upload-pages-artifact@v3
40+
41+
# Deployment job
42+
deploy:
43+
environment:
44+
name: github-pages
45+
url: ${{ steps.deployment.outputs.page_url }}
46+
runs-on: ubuntu-latest
47+
needs: build
48+
steps:
49+
- name: Deploy to GitHub Pages
50+
id: deployment
51+
uses: actions/deploy-pages@v4

‎index.html

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</div>
4545

4646
<div class="apply-btn-container">
47-
<a href="#" class="apply-btn1">지금 신청하기 <img src="Arrow.svg" alt="arrow"></a>
47+
<a href="https://forms.gle/WvLC9fbhtCGAvMLD8" class="apply-btn1">지금 신청하기 <img src="Arrow.svg" alt="arrow"></a>
4848
</div>
4949
</header>
5050
<main>
@@ -103,7 +103,7 @@
103103
<table class="schedule-table">
104104
<tr>
105105
<td class="label">참가자 모집</td>
106-
<td class="value">2024. 10. 1. - 2024. 10. 26.</td>
106+
<td class="value">2024. 10. 8. - 2024. 10. 11.</td>
107107
</tr>
108108
<tr>
109109
<td class="label">주제 공개</td>
@@ -115,7 +115,7 @@
115115
</tr>
116116
<tr>
117117
<td class="label">참가 대상</td>
118-
<td class="value">n0명</td>
118+
<td class="value">75명</td>
119119
</tr>
120120
<tr>
121121
<td class="label">참가 대상</td>
@@ -144,22 +144,30 @@
144144
<ul id='timeline'>
145145
<li class='event'>
146146
<span class="work">입장</span>
147-
<span class='date'>19:00</span>
147+
<span class='date'>18:00</span>
148148
<span class='circle'></span>
149149
<div class='content'>
150150

151151
</div>
152152
</li>
153153
<li class='event'>
154154
<span class="work">개회식</span>
155-
<span class='date'>20:00</span>
155+
<span class='date'>19:00</span>
156156
<span class='circle'></span>
157157
<div class='content'>
158158
</div>
159159
</li>
160160
<li class='event'>
161161
<span class="work">1차 스프린트</span>
162-
<span class='date'>21:00</span>
162+
<span class='date'>20:00</span>
163+
<span class='circle'></span>
164+
<div class='content'>
165+
166+
</div>
167+
</li>
168+
<li class='event'>
169+
<span class="work">돌발 퀴즈쇼</span>
170+
<span class='date'>21:00~</span>
163171
<span class='circle'></span>
164172
<div class='content'>
165173

@@ -174,7 +182,7 @@
174182
</li>
175183
<li class='event'>
176184
<span class="work">2차 스프린트</span>
177-
<span class='date'>00:00</span>
185+
<span class='date'>01:00</span>
178186
<span class='circle'></span>
179187
<div class='content'>
180188

@@ -189,22 +197,27 @@
189197
</li>
190198
<li class='event'>
191199
<span class="work">발표회</span>
192-
<span class='date'>06:20</span>
200+
<span class='date'>06:30</span>
193201
<span class='circle'></span>
194202
<div class='content'>
195203

196204
</div>
197205
</li>
198206
<li class='event'>
199-
<span class="work">심사 집계</span>
200-
<span class='date'>07:30</span>
207+
<span class="work">심사 집계 및 이벤트 발표</span>
208+
<span class='date'>08:00</span>
201209
<span class='circle'></span>
202210
<div class='content'>
203211
</div>
204212
</li>
205213
<li class='event'>
206214
<span class="work">순위 발표 및 시상</span>
207-
<span class='date'>08:00</span>
215+
<span class='date'>08:30</span>
216+
<span class='circle'></span>
217+
</li>
218+
<li class='event'>
219+
<span class="work">마무리</span>
220+
<span class='date'>09:00</span>
208221
<span class='circle'></span>
209222
</li>
210223
</ul>
@@ -224,11 +237,11 @@
224237
<div class="footer-contact">
225238
<div>
226239
<p>instagram</p>
227-
<p>Mail</p>
240+
<p>mail</p>
228241
</div>
229242
<div>
230-
<p>인스타</p>
231-
<p>a24cc410d@gmail.com</p>
243+
<p>@moyeothon</p>
244+
<p>moyeothon@gmail.com</p>
232245
</div>
233246
<div class="copyright">
234247
<p>Copyright © 2024 모여톤 운영단</p>

‎styles.css

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ body {
3030

3131
#header {
3232
justify-content: center;
33+
/* height: 100vh; */
3334
}
3435

3536
.logo-container {
@@ -169,6 +170,9 @@ main {
169170
color: var(--black);
170171
width: 54%;
171172
margin: 324px auto 0;
173+
padding: 80px;
174+
border-radius: 80px;
175+
background-color: #FFFFFF;
172176
}
173177

174178
.introduce-title {
@@ -237,8 +241,10 @@ main {
237241

238242
.card-container {
239243
display: flex;
240-
justify-content: flex-start;
244+
justify-content: center;
241245
overflow: hidden;
246+
align-self: center;
247+
width: 100%;
242248
}
243249

244250
.card {
@@ -342,7 +348,7 @@ tr:last-child td {
342348
flex-direction: column;
343349
margin: 106px auto 0;
344350
padding: 56px;
345-
width: 68%;
351+
width: 50%;
346352
border-radius: 50px;
347353
font-family: Pretendard;
348354
background-color: white;

0 commit comments

Comments
 (0)