Skip to content

Commit e13e65a

Browse files
mucho613mucho613
authored
Merge pull request #14 from coderdojo-japan/feature/default-layout
[DCJ2025-115] デフォルトのレイアウトを作成
2 parents de746de + cfd5883 commit e13e65a

File tree

10 files changed

+25
-657
lines changed

10 files changed

+25
-657
lines changed

‎_includes/footer.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<footer class="site-footer">
22
<div class="footer-logo">
3-
<img src="/img/2025/top/footer_logo.png" alt="DojoCon Japan 2025 Inspire Next." />
3+
<img src="/img/2025/common/footer-logo.png" alt="DojoCon Japan 2025 Inspire Next." />
44
</div>
55
<div class="footer-social">
66
<a href="https://twitter.com/{{ site.twitter }}" target="_blank" rel="noopener" class="social-x" aria-label="X">
@@ -23,4 +23,4 @@
2323
<div class="footer-copyright">
2424
&copy; DojoCon Japan 2025 実行委員会
2525
</div>
26-
</footer>
26+
</footer>

‎_includes/header.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<h1 class="max-w-lg mx-auto pt-5 px-8">
2+
<a href="/">
3+
<img src="/img/2025/common/header-logo.png" alt="DojoCon Japan 2025 Inspire Next." />
4+
</a>
5+
</h1>

‎_layouts/default.html

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1-
{% if page_title or page_title =='' %}
2-
{% assign page_title = page.title %}
1+
{% if page_title or page_title == '' %}
2+
{% assign page_title = page.title %}
33
{% endif %}
4-
{% if page_subtitle or page_subtitle =='' %}
5-
{% assign page_subtitle = page.subtitle %}
4+
{% if page_subtitle or page_subtitle == '' %}
5+
{% assign page_subtitle = page.subtitle %}
66
{% endif %}
77
{% assign page_title = page.title %}
88
<!DOCTYPE html>
99
<html lang="ja" dir="ltr">
10-
{% include head.html %}
11-
<body>
12-
{% include navbar.html %}
13-
{{ content }}
10+
{% include head.html %}
11+
12+
<body class="bg-linear-106 from-[#9d1e29] to-[#d4932a] text-[#262626] font-bold tracking-wider min-h-dvh p-4 flex">
13+
<div class="bg-white rounded-2xl min-h-full flex-grow flex flex-col">
14+
{% include header.html %}
15+
16+
<div class="flex-grow">
17+
{{ content }}
18+
</div>
1419

15-
<div id="page-top"><a href="#top"><img src="/img/svg/up.svg" alt="Up" width="24px" /></a></div>
1620
{% include footer.html %}
17-
</body>
21+
</div>
22+
</body>
23+
1824
</html>

0 commit comments

Comments
 (0)