Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add venue info to hero and add specific section #48

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/components/icons/pin_black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/components/icons/pin_white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
158 changes: 158 additions & 0 deletions src/components/top/Date.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
---
import Panel from "../Layouts/Panel.astro";
import MiniPanel from "../Layouts/MiniPanel.astro";

import PinIcon from "../icons/pin_black.svg";
import ArrowUpRightFromSquareIcon from "../icons/arrow-up-right-from-square.svg";
---

<style>
.date {
text-align: center;

display: flex;
flex-direction: column;
gap: 16px;

margin-bottom: 24px;

.time {
font-family: "Futura", "Jost", sans-serif;
font-size: 36px;
font-weight: 500;
line-height: 47.81px;
text-underline-position: from-font;
text-decoration-skip-ink: none;
}

.start {
font-family: "Futura", "Jost", sans-serif;
font-size: 24px;
font-weight: 500;
line-height: 31.88px;
text-underline-position: from-font;
text-decoration-skip-ink: none;
}

.venue {
display: flex;
justify-content: center;
align-items: baseline;
gap: 12px;

a {
font-size: 24px;
font-weight: 600;
line-height: 36px;
text-align: center;
text-decoration-line: underline;
text-decoration-style: solid;
text-underline-position: from-font;
text-decoration-skip-ink: none;
}
}
}

.zenyasai {
.header {
padding-bottom: 16px;
margin-bottom: 16px;
border-bottom: 1px solid #AEAEB2;

h3 {
font-size: 20px;
font-weight: 600;
line-height: 30px;
text-align: left;
text-underline-position: from-font;
text-decoration-skip-ink: none;
}
}

.body {
p {
font-size: 14px;
font-weight: 300;
line-height: 32px;
text-align: left;
text-underline-position: from-font;
text-decoration-skip-ink: none;
}
a {
text-decoration: none;
}

ul {
padding-left: 16px;

li {
font-size: 16px;
font-weight: 600;
line-height: 32px;
text-align: left;
text-underline-position: from-font;
text-decoration-skip-ink: none;
}
}
}
}

.connpass {
margin-top: 24px;
display: flex;
justify-content: center;

a {
background-color: #fff;

padding: 16px 24px;
border: 1px solid #AEAEB2;
border-radius: 4px;

text-align: center;
font-size: 16px;
font-weight: 600;
line-height: 24px;
text-align: left;
text-underline-position: from-font;
text-decoration-skip-ink: none;
text-decoration: none;
}
}
</style>

<Panel title="Date">
<div class="date">
<p class="time">2025.1.18 (Sat.) 11:00〜18:00</p>
<p class="start">Door Open 10:30</p>
<div class="venue">
<img src={PinIcon.src} alt="map pin" height="20" />
<a href="https://salvia.hall-info.jp/about/#access">横浜市鶴見区文化センター サルビアホール</a>
</div>
</div>
<div class="zenyasai">
<MiniPanel backgroundColor="#FCECE8">
<div class="header">
<h3>前夜祭について</h3>
</div>
<div class="body">
<p>チケットを購入した方のみご参加いただけます。詳細は <a href="https://connpass.com/event/339170/">connpass のイベント</a>をご確認ください。</p>
<ul>
<li>
日時:2025.1.17 (Fri.)
<ul>
<li>第一部:クリエイティブコーディングワークショップ 16:00~</li>
<li>第二部:新年往復! 駅伝トーク(鶴見中継所まで) 18:00~</li>
</ul>
</li>
<li>
会場:株式会社アンドパッド 東京都千代田区神田練塀町300 住友不動産秋葉原駅前ビル 9階
</li>
</ul>
</div>
<div class="connpass">
<a href="https://connpass.com/event/339170/">詳細を確認する(connpass)<img src={ArrowUpRightFromSquareIcon.src} height="16" /></a>
</div>
</MiniPanel>
</div>
</Panel>
43 changes: 31 additions & 12 deletions src/components/top/Hero.astro
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
---
import PrimaryLogoWhiteImage from "../../imgs/primary_logo_white.png";
import TriImage from "../../imgs/tri.png";
import TicketButtonBefore from "./TicketButtonBefore.astro";
import TicketButtonSelling from "./TicketButtonSelling.astro";

import PrimaryLogoWhiteImage from "../../imgs/primary_logo_white.png";
import TriImage from "../../imgs/tri.png";
import PinIcon from "../icons/pin_white.svg";

function isTicketOpen(): boolean {
return true;
}
Expand Down Expand Up @@ -71,21 +73,34 @@ function isTicketOpen(): boolean {
a,
p {
color: #fff;
text-decoration: none;
}

.inner {
display: flex;
flex-direction: column;
gap: 8px;

.en {
display: flex;
justify-content: center;
align-items: baseline;
flex-wrap: wrap;
gap: 4px;

img {
margin-right: 8px;
}

p {
font-family: "Futura", "Jost", sans-serif;
font-size: 24px;
font-weight: 500;
font-size: 26px;
line-height: 36px;
line-height: 31.88px;
text-align: center;
text-decoration-line: underline;
text-decoration-style: solid;
text-underline-position: from-font;
text-decoration-skip-ink: none;

}
@media screen and (width <= 480px) {
p {
Expand All @@ -99,12 +114,16 @@ function isTicketOpen(): boolean {
display: flex;
justify-content: center;
flex-wrap: wrap;
gap: 2px;

p {
font-weight: 500;
font-weight: 600;
font-size: 16px;
line-height: 24px;
text-align: center;
text-decoration-line: underline;
text-decoration-style: solid;
text-underline-position: from-font;
text-decoration-skip-ink: none;
}
@media screen and (width <= 480px) {
p {
Expand Down Expand Up @@ -152,11 +171,11 @@ function isTicketOpen(): boolean {
rel="noopener noreferrer"
class="inner"
>
<div class="ja">
<p>横浜市鶴見区民文化センター</p><p>サルビアホール</p>
</div>
<div class="en">
<p>Tsurumi Cultural Center</p><p>"Salvia Hall"</p>
<img src={PinIcon.src} height="24" /><p>Tsurumi Cultural Center</p><p>"Salvia Hall"</p>
</div>
<div class="ja">
<p>(横浜市鶴見区民文化センター</p><p>サルビアホール)</p>
</div>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/top/KeynoteSpeakers.astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import JhawthornImage from "../../imgs/jhawthorn.jpg";
import EagletmtImage from "../../imgs/eagletmt.jpg";
---

<Panel title="Keynote Speakers" subtitle="基調講演">
<Panel title="Keynote Speakers">
<div class="inner">
<KeynoteSpeaker
iconSrc={JhawthornImage.src}
Expand Down
4 changes: 3 additions & 1 deletion src/components/top/TopMain.astro
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
---
import News from "../news/List.astro";
import About from "./About.astro";
import DateInfo from "./Date.astro";
import News from "../news/List.astro";
import KeynoteSpeakers from "./KeynoteSpeakers.astro";
---

<About />
<DateInfo />
<News limit={3}/>
<KeynoteSpeakers />