Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/bamcasa/moyeothon
Browse files Browse the repository at this point in the history
  • Loading branch information
@bamcasa
bamcasa committed Oct 8, 2024
2 parents 4cf52d2 + 268ff2f commit 3bee6c2
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 16 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/jekyll-gh-pages.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
name: Deploy Jekyll with GitHub Pages dependencies preinstalled

on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
with:
source: ./
destination: ./_site
- name: Upload artifact
uses: actions/upload-pages-artifact@v3

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
41 changes: 27 additions & 14 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</div>

<div class="apply-btn-container">
<a href="#" class="apply-btn1">지금 신청하기 <img src="Arrow.svg" alt="arrow"></a>
<a href="https://forms.gle/WvLC9fbhtCGAvMLD8" class="apply-btn1">지금 신청하기 <img src="Arrow.svg" alt="arrow"></a>
</div>
</header>
<main>
Expand Down Expand Up @@ -103,7 +103,7 @@
<table class="schedule-table">
<tr>
<td class="label">참가자 모집</td>
<td class="value">2024. 10. 1. - 2024. 10. 26.</td>
<td class="value">2024. 10. 8. - 2024. 10. 11.</td>
</tr>
<tr>
<td class="label">주제 공개</td>
Expand All @@ -115,7 +115,7 @@
</tr>
<tr>
<td class="label">참가 대상</td>
<td class="value">n0명</td>
<td class="value">75명</td>
</tr>
<tr>
<td class="label">참가 대상</td>
Expand Down Expand Up @@ -144,22 +144,30 @@
<ul id='timeline'>
<li class='event'>
<span class="work">입장</span>
<span class='date'>19:00</span>
<span class='date'>18:00</span>
<span class='circle'></span>
<div class='content'>

</div>
</li>
<li class='event'>
<span class="work">개회식</span>
<span class='date'>20:00</span>
<span class='date'>19:00</span>
<span class='circle'></span>
<div class='content'>
</div>
</li>
<li class='event'>
<span class="work">1차 스프린트</span>
<span class='date'>21:00</span>
<span class='date'>20:00</span>
<span class='circle'></span>
<div class='content'>

</div>
</li>
<li class='event'>
<span class="work">돌발 퀴즈쇼</span>
<span class='date'>21:00~</span>
<span class='circle'></span>
<div class='content'>

Expand All @@ -174,7 +182,7 @@
</li>
<li class='event'>
<span class="work">2차 스프린트</span>
<span class='date'>00:00</span>
<span class='date'>01:00</span>
<span class='circle'></span>
<div class='content'>

Expand All @@ -189,22 +197,27 @@
</li>
<li class='event'>
<span class="work">발표회</span>
<span class='date'>06:20</span>
<span class='date'>06:30</span>
<span class='circle'></span>
<div class='content'>

</div>
</li>
<li class='event'>
<span class="work">심사 집계</span>
<span class='date'>07:30</span>
<span class="work">심사 집계 및 이벤트 발표</span>
<span class='date'>08:00</span>
<span class='circle'></span>
<div class='content'>
</div>
</li>
<li class='event'>
<span class="work">순위 발표 및 시상</span>
<span class='date'>08:00</span>
<span class='date'>08:30</span>
<span class='circle'></span>
</li>
<li class='event'>
<span class="work">마무리</span>
<span class='date'>09:00</span>
<span class='circle'></span>
</li>
</ul>
Expand All @@ -224,11 +237,11 @@
<div class="footer-contact">
<div>
<p>instagram</p>
<p>Mail</p>
<p>mail</p>
</div>
<div>
<p>인스타</p>
<p>a24cc410d@gmail.com</p>
<p>@moyeothon</p>
<p>moyeothon@gmail.com</p>
</div>
<div class="copyright">
<p>Copyright © 2024 모여톤 운영단</p>
Expand Down
10 changes: 8 additions & 2 deletions styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ body {

#header {
justify-content: center;
/* height: 100vh; */
}

.logo-container {
Expand Down Expand Up @@ -170,6 +171,9 @@ main {
align-items: center;
/* width: 54%; */
margin: 324px auto 0;
padding: 80px;
border-radius: 80px;
background-color: #FFFFFF;
}

.introduce-title {
Expand Down Expand Up @@ -238,8 +242,10 @@ main {

.card-container {
display: flex;
justify-content: flex-start;
justify-content: center;
overflow: hidden;
align-self: center;
width: 100%;
}

.card {
Expand Down Expand Up @@ -343,7 +349,7 @@ tr:last-child td {
flex-direction: column;
margin: 106px auto 0;
padding: 56px;
width: 68%;
width: 50%;
border-radius: 50px;
font-family: Pretendard;
background-color: white;
Expand Down

0 comments on commit 3bee6c2

Please sign in to comment.