Skip to content

Commit 77b0839

Browse files
committed
Import index.html from teaser and split its head partial to be DRY
1 parent 37f6d37 commit 77b0839

31 files changed

+116
-144
lines changed

_includes/google-analytics.html

Lines changed: 0 additions & 9 deletions
This file was deleted.

_includes/head.html

Lines changed: 50 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
<title>{{ site.title }} {{ site.year }} | {{ site.subtitle }}</title>
99
{% endif %}
1010

11-
<!-- Meta -------------------------- -->
12-
<meta property="fb:app_id" content="1750803431730303" />
13-
<meta name="twitter:card" content="summary_large_image" />
14-
<meta name="twitter:site" content="@DojoConJapan" />
11+
<!-- OGP for Social Services -->
12+
<meta property="fb:admins" content="715330868">
13+
<meta property="fb:app_id" content="805184859580207">
14+
<meta name="twitter:card" content="summary" />
15+
<!--<meta name="twitter:site" content="@??????" />-->
1516
{% if page.title %}
1617
<meta name="twitter:title" content="{{ page.title | strip_html }} | {{ site.title }} {{ site.year }}" />
1718
<meta property="og:title" content="{{ page.title | strip_html }} | {{ site.title }} {{ site.year }}" />
@@ -24,8 +25,8 @@
2425
<meta name="twitter:image" content="{{ site.url }}{{ page.thumbnail }}" />
2526
<meta property="og:image" content="{{ site.url }}{{ page.thumbnail }}" />
2627
{% else %}
27-
<meta name="twitter:image" content="{{ site.url }}/img/ogp/ogp.jpg" />
28-
<meta property="og:image" content="{{ site.url }}/img/ogp/ogp.jpg" />
28+
<meta name="twitter:image" content="{{ site.url }}/img/ogp.jpg" />
29+
<meta property="og:image" content="{{ site.url }}/img/ogp.jpg" />
2930
{% endif %}
3031

3132
{% if page.url != "/" %}
@@ -34,7 +35,6 @@
3435
<meta property="og:type" content="website" />
3536
{% endif %}
3637

37-
<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
3838
{% if page.description %}
3939
<meta property="og:description" content="{{ page.description | strip_html | escape }}" />
4040
<meta name="twitter:description" content="{{ page.description | strip_html | escape }}" />
@@ -45,16 +45,25 @@
4545
<meta name="description" content="{{ site.description | strip_html | escape }}" />
4646
{% endif %}
4747

48-
<!-- Google Analytics -------------------------- -->
48+
<!-- Google Analytics and Tag Manager (gtag.js) only in Production-->
4949
{% if jekyll.environment == 'production' %}
50-
{% include google-analytics.html %}
50+
<!-- TODO: Set gtag.js when it gets ready.
51+
<script async src="https://www.googletagmanager.com/gtag/js?id=G-0123456789"></script>
52+
<script>
53+
window.dataLayer = window.dataLayer || [];
54+
function gtag(){dataLayer.push(arguments);}
55+
gtag('js', new Date());
56+
57+
gtag('config', 'G-0123456789');
58+
</script>
59+
-->
5160
{% endif %}
5261

5362
<!-- Favicon -------------------------- -->
54-
<link rel="icon" href="/img/favicon/favicon.svg" sizes="any" type="image/svg+xml">
55-
<link rel="icon" href="/img/favicon/favicon.webp" sizes="512" type="image/webp">
56-
<link rel="apple-touch-icon" href="/img/favicon/apple-touch-icon.png"> <!-- 192x192px -->
57-
<!-- favicon.ico をルートディレクトリにそっと置く。しかしheadには書かない。 -->
63+
<link rel="icon" href="/img/coderdojo.svg" sizes="any" type="image/svg+xml">
64+
<link rel="icon" href="/img/coderdojo.webp" sizes="512" type="image/webp">
65+
<link rel="apple-touch-icon" href="/img/apple-touch-icon.png"> <!-- 192x192px -->
66+
<!-- MEMO: デフォルト用に favicon.ico をルートディレクトリにも置く: /favicon.ico -->
5867

5968
<!-- CSS Framework -------------------------- -->
6069
<!-- Font Awasome https://fontawesome.com/ -->
@@ -63,6 +72,32 @@
6372
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/[email protected]" integrity="sha512-M4ecs0CyhBq7W0PeumwMxVaA9pWbhuD4mCqGTe7/357R8/avaeGSJAtk2dYCgFrZyWvjq1Sju0Wcyf2jnP941Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
6473

6574
<!-- CSS -------------------------- -->
66-
<!-- DojoCon CSS -->
67-
<link rel="stylesheet" href="/css/main.css?3ba454d" />
75+
<link rel="stylesheet" href='/css/main.css?v={{ "now" | date: "%Y-%m-%d_%H-%M-%S" }}' />
76+
<style type="text/css">
77+
@import"https://fonts.googleapis.com/css2?family=Space+Mono&display=swap";
78+
html { scroll-behavior:smooth }
79+
body {
80+
font-family:"Roboto","Noto Sans JP",sans-serif;
81+
margin:0;
82+
text-align:center;
83+
color:#046;
84+
padding-top:60px;
85+
}
86+
.container {
87+
text-align: center;
88+
font-size: 4vw;
89+
font-family: 'Space Mono';
90+
}
91+
92+
.cursor::after{
93+
content:"_";
94+
animation: blink 1s infinite
95+
}
96+
@keyframes blink{
97+
0% { opacity:0 }
98+
50% { opacity:0 }
99+
51% { opacity:1 }
100+
100% { opacity:1 }
101+
}
102+
</style>
68103
</head>

_layouts/plain.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!DOCTYPE html>
2+
<html lang="ja" dir="ltr">
3+
{% include head.html %}
4+
5+
{{ content }}
6+
7+
8+
<!--
9+
<body class="bg-linear-106 from-[#9d1e29] to-[#d4932a] text-[#262626] tracking-wider min-h-dvh p-4 flex">
10+
<div class="bg-white rounded-2xl min-h-full flex-grow flex flex-col">
11+
<div class="flex-grow">
12+
TODO: content
13+
</div>
14+
</div>
15+
16+
TODO: include footer.html
17+
</body>
18+
-->
19+
20+
</html>

img/android-chrome-192x192.png

-309 Bytes
Loading

img/apple-touch-icon.png

-163 Bytes
Loading

img/coderdojo.png

-215 Bytes
Loading

img/coderdojo.svg

Lines changed: 1 addition & 0 deletions
Loading

img/coderdojo.webp

5.2 KB
Loading

img/cover-photo.webp

-6.49 KB
Loading

img/cover.jpg

-4.62 KB
Loading

0 commit comments

Comments
 (0)