Skip to content

Commit

Permalink
add SUZURI & speaker description / map update
Browse files Browse the repository at this point in the history
  • Loading branch information
K-Sakanoshita committed Nov 23, 2022
1 parent bcdd6b2 commit 77ad505
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions _data/location.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
bbox2_lon: 134.84363257884982
bbox2_lat: 34.76639996259122
layer: mapnik
marker_lat: 34.764460955626284
marker_lon: 134.84009206295013
marker_lat: 34.764377224754156
marker_lon: 134.8401215672493
zoom: 17
2 changes: 2 additions & 0 deletions _data/talks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
name: 多田 功
position: 加古川市 スマートシティ担当課長
img: tada.png
description: 加古川市が取り組む、行政情報ダッシュボード、オープンデータカタログサイト、プラトーの紹介

11 changes: 6 additions & 5 deletions _includes/map.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<section>
<div class="container-fluid">
<div class="row">
<div class="col ratio" style="--bs-aspect-ratio: 35vh;">
<div class="col" style="height: 40vh;">
{% assign l = site.data.location[0] %}
<iframe class="m-0 p-0" width="100%" height="100%" frameborder="0" scrolling="no" marginheight="0"
marginwidth="0" src="https://www.openstreetmap.org/export/embed.html?bbox={{ l['bbox1_lon'] }}%2C{{ l['bbox1_lat'] }}%2C{{ l['bbox2_lon'] }}%2C{{ l['bbox2_lat'] }}&amp;layer={{ l['layer'] }}&amp;marker={{ l['marker_lat'] }}%2C{{ l['marker_lon'] }}"></iframe><br />
<small><a href="https://www.openstreetmap.org/?mlat={{ l['marker_lat'] }}&amp;mlon={{ l['marker_lon'] }}#map={{ l['zoom'] }}/{{ l['marker_lat'] }}/{{ l['marker_lon'] }}">大きな地図を表示</a></small>
<iframe class="m-0 p-0" width="100%" height="100%" frameborder="0" marginheight="0" marginwidth="0"
src="https://www.openstreetmap.org/export/embed.html?bbox={{ l['bbox1_lon'] }}%2C{{ l['bbox1_lat'] }}%2C{{ l['bbox2_lon'] }}%2C{{ l['bbox2_lat'] }}&amp;layer={{ l['layer'] }}&amp;marker={{ l['marker_lat'] }}%2C{{ l['marker_lon'] }}"></iframe><br />
<small><a class="nav-link text-white text-capitalize text-end"
href="https://www.openstreetmap.org/?mlat={{ l['marker_lat'] }}&amp;mlon={{ l['marker_lon'] }}#map={{ l['zoom'] }}/{{ l['marker_lat'] }}/{{ l['marker_lon'] }}">大きな地図を表示</a></small>
</div>
</div>
</div>
</section>
</section>
4 changes: 2 additions & 2 deletions _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
</div>
<div class="offcanvas-body">
<ul class="navbar-nav ms-auto">
<li class="nav-item"><a href="https://sotmjp2022.peatix.com/" class="nav-link">参加登録</a></li>
<li class="nav-item"><a href="./index.html#about" class="nav-link">SOTMJについて</a></li>
<li class="nav-item"><a href="./index.html#news" class="nav-link">お知らせ</a></li>
<li class="nav-item"><a href="./index.html#event-outline" class="nav-link">開催概要</a></li>
<li class="nav-item"><a href="./index.html#sponser" class="nav-link">スポンサー</a></li>
<li class="nav-item"><a href="./index.html#timetable" class="nav-link">タイムテーブル</a></li>
<li class="nav-item"><a href="https://sotmjp2022.peatix.com/" class="nav-link">参加登録</a></li>
<li class="nav-item"><a href="./index.html#sponser" class="nav-link">スポンサー</a></li>
<li class="nav-item"><a href="./coc.html" class="nav-link">行動規範</a></li>
</ul>
</div>
Expand Down
1 change: 1 addition & 0 deletions _includes/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ <h2 class="display-6 fw-bold mb-4"><i class="bi bi-newspaper"></i> お知らせ<
</ul>
<div class="overflow-auto" style="height:300px;">
<ul>
<li>Apoharukaさんに State of the Map Japanグッズを作ってもらいました。<a href="https://suzuri.jp/apoharuka/designs/12561206">SUZURIで販売中です!</a></li>
<li>2022/11/20 本カンファレンスのテーマは「リスタート」に決まりました</li>
<li>2022/11/16 <a href="https://geolonia.com/">Geolonia</a>様がシルバースポンサーになりました</li>
<li>2022/11/15 <a href="https://web.pref.hyogo.lg.jp/">兵庫県</a>様から後援を頂きました</li>
Expand Down
4 changes: 2 additions & 2 deletions _includes/speaker.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ <h2 class="display-6 fw-bold mb-4" id="speaker"><i class="bi bi-chat-square"></i
</div>
<div class="col-10 col-md-7 col-lg-8 col-xl-9 p-3">
<h4 class="fs-2">{{ talk.title }}</h4>
<p class="fs-4">{{ talker.name }}</p>
<p>{{ talk.position }}</p>
<p class="speaker">{{ talk.name }} | {{ talk.position }}</p>
<p>{{ talk.description }}</p>
</div>
</div>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion _includes/sponser.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h3 class="text-uppercase m-5">{{ sponser[0] }}</h3>
<div class="h-100" style="display: flex; justify-content: center; align-items: center;">
{% if company.url != "https://www.example.com/" %}
<a href="{{ company.url }}"><img src="img/{{ company.img }}" alt="{{ company.company }}"
width="200vw"></a>
width="200"></a>
{% else %}
<img src="img/{{ company.img }}" alt="{{ company.company }}" width="200vw">
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ li a {

a img {
border-bottom: initial !important;
margin: 60px 120px;
margin: 60px 100px;
}

a:hover {
Expand Down

0 comments on commit 77ad505

Please sign in to comment.