Skip to content
/ dojocon2021.coderdojo.jp Public
  • Sponsor
  • Notifications You must be signed in to change notification settings
  • Fork 1
  • Star 1

Commit 08c78a4

Browse files
yasulabyasulab
committedNov 13, 2021
Refactor: Remove unnecessary site.url parameters
1 parent 229348a commit 08c78a4

File tree

11 files changed

+119
-120
lines changed

11 files changed

+119
-120
lines changed
 

‎_includes/footer.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<footer>
22
<nav class="share">
3-
<a href="https://www.facebook.com/share.php?u={{site.url}}" target="_blank" class="share-facebook" rel="noopener"><i class="fab fa-facebook-square"></i> Facebook でシェア</a>
4-
<a href="https://twitter.com/share?url={{site.url}}{{page.url}}&text={{site.title}} | {{page.title}}&hashtags=DojoConJapan&via={{ site.twitter_username }}&related={{site.twitter_username}}" target="_blank" class="share-twitter" rel="noopener"><i class="fab fa-twitter-square"></i> Twitter でシェア</a>
5-
<a href="https://social-plugins.line.me/lineit/share?url={{site.url}}{{page.url}}" class="share-line"><i class="fab fa-line"></i> LINE でシェア</a>
3+
<a href="https://www.facebook.com/share.php?u={{ site.url }}" target="_blank" class="share-facebook" rel="noopener"><i class="fab fa-facebook-square"></i> Facebook でシェア</a>
4+
<a href="https://twitter.com/share?url={{ site.url }}{{ page.url }}&text={{ site.title }} | {{ page.title }}&hashtags=DojoConJapan&via={{ site.twitter_username }}&related={{ site.twitter_username }}" target="_blank" class="share-twitter" rel="noopener"><i class="fab fa-twitter-square"></i> Twitter でシェア</a>
5+
<a href="https://social-plugins.line.me/lineit/share?url={{ site.url }}{{ page.url }}" class="share-line"><i class="fab fa-line"></i> LINE でシェア</a>
66
</nav>
77
<nav class="footer-menu">
88
<ul class="footer-menu-list">

‎_includes/navbar.html

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<header>
22
<nav class="navbar navbar-expand-lg navbar-dark text-white bg-main fixed-top">
3-
<a class="navbar-brand" href="{{ site.url }}">
4-
<img src="{{ site.url }}/img/nav-icon.png" height="40px" class="d-inline-block align-top" alt="ナビゲーション・アイコン">
3+
<a class="navbar-brand" href="/">
4+
<img src="/img/nav-icon.png" height="40px" class="d-inline-block align-top" alt="ナビゲーション・アイコン">
55
</a>
66
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-nav" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
77
<span class="navbar-toggler-icon"></span>
88
</button>
99
<div class="collapse navbar-collapse" id="navbar-nav">
1010
<div class="navbar-nav">
11-
<a class="nav-item nav-link active" href="{{ site.url }}">ホーム <span class="sr-only"></span></a>
12-
<a class="nav-item nav-link active" href="{{ site.url }}#outline">概要</a>
13-
<a class="nav-item nav-link active" href="{{ site.url }}#news">お知らせ</a>
14-
<!--<a class="nav-item nav-link active" href="{{ site.url }}/timetable">タイムテーブル</a>-->
15-
<!--<a class="nav-item nav-link active" href="{{ site.url }}/sessions">セッション</a>-->
16-
<!--<a class="nav-item nav-link active" href="{{ site.url }}/events">イベント企画</a>-->
17-
<!--<a class="nav-item nav-link active" href="{{ site.url }}/contest">コンテスト</a>-->
18-
<!--<a class="nav-item nav-link active" href="{{ site.url }}/workshops">ワークショップ</a>-->
19-
<!--<a class="nav-item nav-link active" href="{{ site.url }}/dojos">Dojo自慢</a>-->
20-
<a class="nav-item nav-link active" href="{{ site.url }}#contact">お問い合わせ</a>
11+
<a class="nav-item nav-link active" href="/">ホーム <span class="sr-only"></span></a>
12+
<a class="nav-item nav-link active" href="/#outline">概要</a>
13+
<a class="nav-item nav-link active" href="/#news">お知らせ</a>
14+
<!--<a class="nav-item nav-link active" href="/timetable">タイムテーブル</a>-->
15+
<!--<a class="nav-item nav-link active" href="/sessions">セッション</a>-->
16+
<!--<a class="nav-item nav-link active" href="/events">イベント企画</a>-->
17+
<!--<a class="nav-item nav-link active" href="/contest">コンテスト</a>-->
18+
<!--<a class="nav-item nav-link active" href="/workshops">ワークショップ</a>-->
19+
<!--<a class="nav-item nav-link active" href="/dojos">Dojo自慢</a>-->
20+
<a class="nav-item nav-link active" href="/#contact">お問い合わせ</a>
2121
</div>
2222
</div>
2323
</nav>

‎_includes/sessions.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<article class="article article-session">
22
<div class="session-tag">
3-
{{post.tags[0]}}
3+
{{ post.tags[0] }}
44
</div>
5-
<img src="{{site.url}}/img/post/{{post.thumbnail}}" alt="thumbnail of {{ post.title }}" class="article-thumbnail" loading="lazy">
5+
<img src="/img/post/{{ post.thumbnail }}" alt="{{ post.title }}のサムネイル画像" class="article-thumbnail" loading="lazy">
66
<h3 class="article-title">{{ post.title }}</h3>
77
<p>
88
{% for speaker in post.speakers %}
9-
{{speaker}}<br>
10-
{%endfor%}
9+
{{ speaker }}<br>
10+
{% endfor %}
1111
</p>
12-
<p>{{post.time}}</p>
13-
<a href="{{ site.url }}{{ post.url }}" class="button">
12+
<p>{{ post.time} }</p>
13+
<a href="{{ post.url }}" class="button">
1414
もっと見る
1515
</a>
1616
</article>

‎_includes/workshops.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<article class="article article-event">
2-
<img src="{{site.url}}/img/post/{{post.thumbnail}}" alt="thumbnail of {{ post.title }}" class="article-thumbnail" loading="lazy">
2+
<img src="/img/post/{{ post.thumbnail }}" alt="{{ post.title }}のサムネイル画像" class="article-thumbnail" loading="lazy">
33
<h3 class="article-title">{{ post.title }}</h3>
44
<p class="tags">
55
{% for tag in post.tags %}
6-
<span class="tag-workshop">{{tag}}</span>
6+
<span class="tag-workshop">{{ tag }}</span>
77
{% endfor %}
88
</p>
9-
<a href="{{ site.url }}{{ post.url }}" class="button">
9+
<a href="{{ post.url }}" class="button">
1010
もっと見る
1111
</a>
1212
</article>

‎_layouts/default.html

+12-13
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,19 @@
2424

2525
<meta name="twitter:card" content="summary_large_image" />
2626
<meta name="twitter:site" content="@DojoConJapan" />
27-
28-
<meta property="og:url" content="{{site.url}}{{page.url}}" />
27+
<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
2928
{% if page.title %}
30-
<meta property="og:title" content="{{page.title}} | {{site.title}} {{ site.year }}" />
29+
<meta property="og:title" content="{{ page.title }} | {{ site.title }} {{ site.year }}" />
3130
{% else %}
32-
<meta property="og:title" content="{{site.title}} {{ site.year }} | {{site.subtitle}}" />
31+
<meta property="og:title" content="{{ site.title }} {{ site.year }} | {{ site.subtitle }}" />
3332
{% endif %}
3433

3534
{% if page.thumbnail %}
36-
<meta name="twitter:image" content="{{site.url}}//img/post/{{page.thumbnail}}" />
37-
<meta property="og:image" content="{{site.url}}/img/post/{{page.thumbnail}}" />
35+
<meta name="twitter:image" content="{{ site.url }}/img/post/{{ page.thumbnail }}" />
36+
<meta property="og:image" content="{{ site.url }}/img/post/{{ page.thumbnail }}" />
3837
{% else %}
39-
<meta name="twitter:image" content="{{site.url}}/img/home.jpg" />
40-
<meta property="og:image" content="{{site.url}}/img/home.jpg" />
38+
<meta name="twitter:image" content="{{ site.url }}/img/home.jpg" />
39+
<meta property="og:image" content="{{ site.url }}/img/home.jpg" />
4140
{% endif %}
4241

4342
{% if page.url != "/" %}
@@ -46,9 +45,9 @@
4645
<meta property="og:type" content="website" />
4746
{% endif %}
4847

49-
<meta property="og:description" content="{{site.description}}" />
50-
<meta name="description" content="{{site.description}}" />
51-
<meta name="twitter:description" content="{{site.description}}" />
48+
<meta property="og:description" content="{{ site.description }}" />
49+
<meta name="description" content="{{ site.description }}" />
50+
<meta name="twitter:description" content="{{ site.description }}" />
5251

5352
<meta property="fb:app_id" content="1750803431730303" />
5453

@@ -60,7 +59,7 @@
6059
<body>
6160
{% include navbar.html %}
6261
{{content}}
63-
<div id="page-top"><a href="#top"><img src="{{site.url}}/img/svg/up.svg" alt="Up" width="24px" /></a></div>
62+
<div id="page-top"><a href="#top"><img src="/img/svg/up.svg" alt="Up" width="24px" /></a></div>
6463
{% include footer.html %}
6564

6665
<script>
@@ -70,7 +69,7 @@
7069
if(ie11){
7170
var spimg = document.getElementsByClassName("sponsors-rank-img");
7271
for(var i = 0; i < spimg.length; i++) {
73-
spimg[i].style.height = "auto";
72+
spimg[i].style.height = "auto";
7473
spimg[i].style.maxHeight = "none";
7574
}
7675
}

‎_layouts/jiman_media.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ <h1 class="post-title font-weight-bold">{{ page.title }}</h1>
1313
{% elsif page.categories[0] == "workshop" or page.categories[0] == "session" %}
1414
<div class="tags">
1515
{% for tag in page.tags %}
16-
<span class="tag-post">{{tag}}</span>
16+
<span class="tag-post">{{ tag }}</span>
1717
{% endfor %}
1818
</div>
19-
<p class="post-time">{{page.time}}</p>
20-
{%endif%}
19+
<p class="post-time">{{ page.time }}</p>
20+
{% endif %}
2121

2222

2323
<div class='post-content mt-5'>
@@ -29,9 +29,9 @@ <h1 class="post-title font-weight-bold">{{ page.title }}</h1>
2929
{% if page.dojo_icon %}
3030
<img src="https://raw.githubusercontent.com/coderdojo-japan/coderdojo.jp/master/public/img/dojos/{{page.dojo_icon}}" alt='Dojo アイコン' />
3131
{% elsif page.dojo_iconfile %}
32-
<img src="{{site.url}}/img/post/jiman/{{page.dojo_iconfile}}" alt='Dojo アイコン'/>
32+
<img src="/img/post/jiman/{{ page.dojo_iconfile }}" alt='Dojo アイコン'/>
3333
{% else %}
34-
<img src="https://coderdojo.jp/img/dojos/coderdojo.png" alt='CoderDojo ロゴ'/>
34+
<img src="/img/coderdojo.png" alt='CoderDojo ロゴ'/>
3535
{% endif %}
3636
</div>
3737
<div class="col-10">
@@ -40,7 +40,7 @@ <h1 class="post-title font-weight-bold">{{ page.title }}</h1>
4040
</div>
4141
</div>
4242
<div id="spacer" style="height: 2em;"></div>
43-
<a href="/dojo-jiman/" class="btn btn-red"><i class="fas fa-chevron-circle-left"></i> 一覧に戻る</a>
43+
<a href="/dojos" class="btn btn-red"><i class="fas fa-chevron-circle-left"></i> 一覧に戻る</a>
4444
<br />
4545
<a href="/" class="btn btn-red"><i class="fas fa-chevron-circle-left"></i> トップページに戻る</a>
4646
</div>

‎_layouts/jiman_text.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ <h1 class="post-title">{{ page.title }}</h1>
1313
{% elsif page.categories[0] == "workshop" or page.categories[0] == "session" %}
1414
<div class="tags">
1515
{% for tag in page.tags %}
16-
<span class="tag-post">{{tag}}</span>
16+
<span class="tag-post">{{ tag }}</span>
1717
{% endfor %}
1818
</div>
19-
<p class="post-time">{{page.time}}</p>
20-
{%endif%}
19+
<p class="post-time">{{ page.time }}</p>
20+
{% endif %}
2121

2222
<div class='post-content mt-5'>
2323
{% if page.thumbnail %}
24-
<img src="{{site.url}}/img/post/{{page.thumbnail}}" alt='サムネイル画像' />
24+
<img src="/img/post/{{ page.thumbnail }}" alt='サムネイル画像' />
2525
{% else %}
26-
<img src="{{site.url}}/img/ogp_1.png" alt='サムネイル画像' />
26+
<img src="/img/ogp_1.png" alt='サムネイル画像' />
2727
{% endif %}
2828

2929
{{ content }}
@@ -33,11 +33,11 @@ <h1 class="post-title">{{ page.title }}</h1>
3333
<div class="col-2">
3434
<div class="col">
3535
{% if page.dojo_icon %}
36-
<img src="https://raw.githubusercontent.com/coderdojo-japan/coderdojo.jp/master/public/img/dojos/{{page.dojo_icon}}" alt='CoderDojo ロゴ画像' />
36+
<img src="https://coderdojo.jp/img/dojos/{{ page.dojo_icon }}" alt='各 Dojo のロゴ画像' />
3737
{% elsif page.dojo_iconfile %}
38-
<img src="{{site.url}}/img/post/jiman/{{page.dojo_iconfile}}" alt='Dojo アイコン' />
38+
<img src="/img/post/jiman/{{page.dojo_iconfile}}" alt='Dojo アイコン' />
3939
{% else %}
40-
<img src="https://coderdojo.jp/img/dojos/coderdojo.png" alt='CoderDojo ロゴ画像' />
40+
<img src="/img/coderdojo.png" alt='CoderDojo ロゴ画像' />
4141
{% endif %}
4242
</div>
4343
</div>
@@ -47,7 +47,7 @@ <h1 class="post-title">{{ page.title }}</h1>
4747
</div>
4848
</div>
4949
<div id="spacer" style="height: 2em;"></div>
50-
<a href="/dojo-jiman/" class="btn btn-red"><i class="fas fa-chevron-circle-left"></i> 一覧に戻る</a>
50+
<a href="/dojos" class="btn btn-red"><i class="fas fa-chevron-circle-left"></i> 一覧に戻る</a>
5151
<br />
5252
<a href="/" class="btn btn-red"><i class="fas fa-chevron-circle-left"></i> トップページに戻る</a>
5353
</div>

‎dojos/index.md

+64-64
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
---
2-
layout: default
3-
title: Dojo自慢
4-
permalink: /dojo-jiman/
5-
---
6-
7-
<div class="container mt-5">
8-
<div class="row">
9-
<div class="col-md-6 offset-md-3 col-12">
10-
<h1>Dojo自慢</h1>
11-
</div>
12-
</div>
13-
<div class="row">
14-
<div class="col-12 p-3" id="timetable">
15-
<p>
16-
DojoCon Japanでは<a href="{{site.url}}/posts/6/">Dojo自慢を募集</a>いたしました。
17-
</p>
18-
<p>
19-
ご投稿につきましては、以下に掲載させていただきました。
20-
</p>
21-
{% for page in site.pages %}
22-
{% if page.layout == "jiman_media" or page.layout == "jiman_text" %}
23-
<div class="page">
24-
<div class="row">
25-
<div class="col-6 col-md-2">
26-
<div class="row">
27-
<div class="col-4 col-md-3 jiman1">
28-
{% if page.dojo_icon %}
29-
<img src="https://raw.githubusercontent.com/coderdojo-japan/coderdojo.jp/master/public/img/dojos/{{page.dojo_icon}}" width="100%" alt='Dojo アイコン' />
30-
{% elsif page.dojo_iconfile %}
31-
<img src="{{site.url}}/img/post/jiman/{{page.dojo_iconfile}}" width="100%" alt='Dojo アイコン' />
32-
{% else %}
33-
<img src="https://coderdojo.jp/img/dojos/coderdojo.png" width="100%" alt='CoderDojo ロゴ'/>
34-
{% endif %}
35-
</div>
36-
<div class="col-8 col-md-9 jiman1">
37-
<p class="text-left dojoname">{{ page.dojo_name }}</p>
38-
</div>
39-
</div>
40-
</div>
41-
<div class="col-9 col-md-8">
42-
<a href="{{page.url}}"> <span class="text-left h2">{{ page.title }}</span></a>
43-
</div>
44-
<div class="col-3 col-md-2 d-flex align-items-center">
45-
<a href="{{page.url}}" class="btn btn-main">もっと見る</a>
46-
</div>
47-
</div>
48-
</div>
49-
{% endif %}
50-
{% endfor %}
51-
</div>
52-
</div>
53-
</div>
54-
55-
<style>
56-
.dojoname{
57-
text-align: center;
58-
padding: 0.8em;
59-
}
60-
.jiman1{
61-
padding-right: 0 !important;
62-
padding-left: 0 !important;
63-
}
64-
</style>
1+
---
2+
layout: default
3+
title: Dojo自慢
4+
permalink: /dojos
5+
---
6+
7+
<div class="container mt-5">
8+
<div class="row">
9+
<div class="col-md-6 offset-md-3 col-12">
10+
<h1>Dojo自慢</h1>
11+
</div>
12+
</div>
13+
<div class="row">
14+
<div class="col-12 p-3" id="timetable">
15+
<p>
16+
DojoCon Japanでは<a href="/posts/6/">Dojo自慢を募集</a>いたしました。
17+
</p>
18+
<p>
19+
ご投稿につきましては、以下に掲載させていただきました。
20+
</p>
21+
{% for page in site.pages %}
22+
{% if page.layout == "jiman_media" or page.layout == "jiman_text" %}
23+
<div class="page">
24+
<div class="row">
25+
<div class="col-6 col-md-2">
26+
<div class="row">
27+
<div class="col-4 col-md-3 jiman1">
28+
{% if page.dojo_icon %}
29+
<img src="https://coderdojo.jp/img/dojos/{{ page.dojo_icon }}" width="100%" alt='Dojo アイコン' />
30+
{% elsif page.dojo_iconfile %}
31+
<img src="/img/post/jiman/{{ page.dojo_iconfile }}" width="100%" alt='Dojo アイコン' />
32+
{% else %}
33+
<img src="/img/coderdojo.png" width="100%" alt='CoderDojo ロゴ'/>
34+
{% endif %}
35+
</div>
36+
<div class="col-8 col-md-9 jiman1">
37+
<p class="text-left dojoname">{{ page.dojo_name }}</p>
38+
</div>
39+
</div>
40+
</div>
41+
<div class="col-9 col-md-8">
42+
<a href="{{ page.url }}"> <span class="text-left h2">{{ page.title }}</span></a>
43+
</div>
44+
<div class="col-3 col-md-2 d-flex align-items-center">
45+
<a href="{{ page.url }}" class="btn btn-main">もっと見る</a>
46+
</div>
47+
</div>
48+
</div>
49+
{% endif %}
50+
{% endfor %}
51+
</div>
52+
</div>
53+
</div>
54+
55+
<style>
56+
.dojoname{
57+
text-align: center;
58+
padding: 0.8em;
59+
}
60+
.jiman1{
61+
padding-right: 0 !important;
62+
padding-left: 0 !important;
63+
}
64+
</style>

‎img/coderdojo.png

2.28 KB
Loading

‎index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ layout: default
7171
<p class="about-text text-left">全国の CoderDojo 関係者によるセッション、交流会、懇親会など。</p>
7272
<!--
7373
<ul class="text-left list-style-none">
74-
<li><a href="{{site.url}}/session"><i class="fas fa-link"></i> セッションの詳細を見る</a></li>
75-
<li><a href="{{site.url}}/event"><i class="fas fa-link"></i> イベント企画の詳細を見る</a></li>
76-
<li><a href="{{site.url}}/workshop"><i class="fas fa-link"></i> ワークショップの詳細を見る</a></li>
74+
<li><a href="/sessions" ><i class="fas fa-link"></i> セッションの詳細を見る</a></li>
75+
<li><a href="/events" ><i class="fas fa-link"></i> イベント企画の詳細を見る</a></li>
76+
<li><a href="/workshops"><i class="fas fa-link"></i> ワークショップの詳細を見る</a></li>
7777
</ul>
7878
-->
7979
</div>

‎privacy.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ Google Analyticsの利用により収集されたデータは、Google社のプ
6060

6161
なお、Google Analyticsのサービス利用による損害については、当実行委員会は責任を負わないものとします。
6262

63-
DojoCon Japan {{ site.url }} 実行委員会<br>
63+
DojoCon Japan {{ site.year }} 実行委員会<br>
6464
連絡先: {{ site.email }}<br>
6565
最終更新日: {{ site.date_published }}

0 commit comments

Comments
 (0)
Please sign in to comment.