2022-11-04/02

Author: Xzonn

.github/workflows/publish.yml

@@ -35,26 +35,26 @@ jobs:
         with:
           name: html
           path: _site
+      - name: Update Algolia index
+        run: |
+          bundle exec jekyll algolia push
+        env:
+          ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
+        if: env.ALGOLIA_API_KEY != ''
+        continue-on-error: true
 
   publish:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         with:
           name: html
           path: _site
-      - name: Update Algolia index
-        run: |
-          bundle exec jekyll algolia push
-        env:
-          ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
-        continue-on-error: true
       - name: Cache Ossutil
         id: cache-ossutil
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ossutil64
           key: ${{ runner.os }}-ossutil64-1.7.14

_data/interviewees.yaml

@@ -18,11 +18,26 @@
   kana: えりかわ めい
   english: Mei Erikawa
   image: mei-erikawa.jpg
+林田宏一:
+  japanese: 林田 宏一
+  kana: はやしだ こういち
+  english: Koichi Hayashida
+  image: koichi-hayashida.jpg
+平竹晋也:
+  japanese: 平竹 晋也
+  kana: ひらたけ しんや
+  english: Shinya Hiratake
+  image: shinya-hiratake.jpg
 神山达哉:
   japanese: 神山 達哉
   kana: かみやま たつや
   english: Tatsuya Kamiyama
   image: tatsuya-kamiyama.jpg
+北原有加:
+  japanese: 北原 有加
+  kana: きたはら ゆうか
+  english: Yuka Kitahara
+  image: yuka-kitahara.jpg
 清武博二:
   japanese: 清武 博二
   kana: きよたけ ひろじ
@@ -48,6 +63,11 @@
   kana: みやうち あつし
   english: Atsushi Miyauchi
   image: atsushi-miyauchi.jpg
+村田翔:
+  japanese: 村田 翔
+  kana: むらた しょう
+  english: Sho Murata
+  image: sho-murata.jpg
 中山朋子:
   japanese: 中山 朋子
   kana: なかやま ともこ

_includes/figure.html

@@ -1,5 +1,9 @@
-{{ include.blank }}<figure{% if include.class %} class="{{ include.class }}"{% endif %}>
+{{ include.blank }}<figure{% if include.class %} class="{{ include.class }}"{% endif %}>{% assign _srcs = include.src | split: "|" %}{% if _srcs.size > 1 %}{% assign _widths = include.width | split: "|" %}{% assign _heights = include.height | split: "|" %}{% assign _links = include.link | split: "|" %}
+{{ include.blank }}  <div class="figure-row">{% for src in _srcs %}{% assign width = _widths[forloop.index0] | default: width %}{% assign height = _heights[forloop.index0] | default: height %}
+{{ include.blank }}    {% include image.html class="figure-image" src=src alt=include.alt width=width height=height %}{% endfor %}
+{{ include.blank }}  </div>{% unless include.no_link %}{% for src in _srcs %}{% assign link = _links[forloop.index0] | default: link %}
+{{ include.blank }}  <a class="figure-link" target="_blank" href="{{ link | default: _src | default: src }}"></a>{% endfor %}{% endunless %}{% else %}
 {{ include.blank }}  {% include image.html class="figure-image" src=include.src alt=include.alt width=include.width height=include.height %}{% unless include.no_link %}
-{{ include.blank }}  <a class="figure-link" target="_blank" href="{{ _src | default: include.src }}"></a>{% endunless %}{% if include.alt %}
-{{ include.blank }}  <figcaption class="caption-figure" id="figure-{% assign src_array = include.src | split: "/" %}{{ src_array.last}}">{{ include.alt }}</figcaption>{% endif %}
+{{ include.blank }}  <a class="figure-link" target="_blank" href="{{ include.link | default: _src | default: include.src }}"></a>{% endunless %}{% endif %}{% if include.alt %}
+{{ include.blank }}  <figcaption class="caption-figure" id="figure-{% assign _src_array = include.src | split: "/" %}{{ _src_array.last}}">{{ include.alt }}</figcaption>{% endif %}
 {{ include.blank }}</figure>

_includes/image.html

@@ -1 +1 @@
-<img{% if include.class %} class="{{ include.class }}"{% endif %} src="{% capture _src %}{% assign _splited_src = include.src | split: "/" %}{% if _splited_src.size == 1 %}{% assign _splited_url = page.url | split: "." %}{{ site.image_cdn }}{{ _splited_url[0] }}/{% endif %}{{ include.src }}{% endcapture %}{{ _src }}" width="{{ include.width | default: 640 }}" height="{{ include.height | default: 360 }}" style="aspect-ratio: {{ include.width | default: 640 }}/{{ include.height | default: 360 }};"{% if include.alt %} alt="{{ include.alt | strip_html | escape }}"{% endif %} decoding="async" loading="lazy" />
+<img{% if include.class %} class="{{ include.class }}"{% endif %} src="{% capture _src %}{% assign _splited_src = include.src | split: "/" %}{% if _splited_src.size == 1 %}{% assign _splited_url = page.url | split: "." %}{% assign _splited_url_size = _splited_url | size | minus: 1 %}{{ site.image_cdn }}{{ _splited_url | slice: 0, _splited_url_size | join: "." }}/{% endif %}{{ include.src }}{% endcapture %}{{ _src }}" width="{{ include.width | default: 640 }}" height="{{ include.height | default: 360 }}" style="aspect-ratio: {{ include.width | default: 640 }}/{{ include.height | default: 360 }};"{% if include.alt %} alt="{{ include.alt | strip_html | escape }}"{% endif %} decoding="async" loading="lazy" />

_includes/interviewee.html

@@ -1,7 +1,7 @@
 {% assign _interviewee = site.data.interviewees[include.name] %}<div class="ni-interviewee">{% if _interviewee.image or include.image %}
   <div class="ni-interviewee-image">{% capture _url %}{% if include.image %}{{ include.image }}{% else %}{{ site.image_cdn }}/interviewees/{{ _interviewee.image }}{% endif %}{% endcapture %}{% include image.html src=_url width="100" height="100" %}</div>{% endif %}
   <div class="ni-interviewee-info">
-    <div class="ni-interviewee-name{% if include.class %} {{ include.class }}{% endif %}"><span class="ni-interviewee-name-zh">{{ include.name }}</span>{% if _interviewee.japanese or include.japanese %}<span class="ni-interviewee-name-ja" lang="ja">{% if include.japanese %}{{ include.japanese }}{% else %}{% if _interviewee.kana %}<span lang="ja"><ruby>{{ _interviewee.japanese | split: " " | first }}<rt>{{ _interviewee.kana | split: " " | first }}</rt></ruby> <ruby>{{ _interviewee.japanese | split: " " | last }}<rt>{{ _interviewee.kana | split: " " | last }}</rt></ruby></span>{% else %}{{ _interviewee.japanese }}{% endif %}{% endif %}</span>{% endif %}</div>
-    <p>{{ include.info }}</p>
+    <div class="ni-interviewee-name{% if include.class %} {{ include.class }}{% endif %}"><span class="ni-interviewee-name-zh">{{ include.name }}</span>{% if _interviewee.japanese or include.japanese %}<span class="ni-interviewee-name-ja" lang="ja">{% if include.japanese %}{{ include.japanese }}{% else %}{% if _interviewee.kana %}<span lang="ja"><ruby>{{ _interviewee.japanese | split: " " | first }}<rt>{{ _interviewee.kana | split: " " | first }}</rt></ruby> <ruby>{{ _interviewee.japanese | split: " " | last }}<rt>{{ _interviewee.kana | split: " " | last }}</rt></ruby></span>{% else %}{{ _interviewee.japanese }}{% endif %}{% endif %}</span>{% endif %}</div>{% if include.info %}
+    <p>{{ include.info }}</p>{% endif %}
   </div>
 </div>

_includes/music.html

@@ -0,0 +1,3 @@
+{{ include.blank }}<div class="music">{% if include._163 %}
+{{ include.blank }}  <div class="_163-music"><iframe class="_163-music-iframe" src="https://music.163.com/outchain/player?type={{ include._i63_type | default: 2 }}&id={{ include._163 }}&auto=1&height=66" title="{{ include.title | default: "网易云音乐播放器" }}" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen loading="lazy" ></iframe></div>{% endif %}
+{{ include.blank }}</div>

assets/css/_content.less

@@ -78,14 +78,30 @@ article::after {
 /* interviewee */
 .ni-interviewee {
   position: relative;
-  padding: 10px;
   display: flex;
+  padding: 10px;
+  flex-wrap: wrap;
+  justify-content: space-around;
 
   & > div {
     margin: 10px;
   }
 }
 
+.ni-interviewee-image {
+  flex: 0 0 104px;
+}
+
+.ni-interviewee-info {
+  flex: 1 0 0%;
+}
+
+@media screen and (max-width: @screen-sm-max) {
+  .ni-interviewee-info {
+    flex: 1 0 100%;
+  }
+}
+
 .ni-interviewee-name {
   width: fit-content;
   margin-bottom: 15px;
@@ -112,6 +128,7 @@ article::after {
 .ni-author-image, .ni-interviewee-image {
   & > img {
     object-fit: cover;
+    object-position: top;
     box-sizing: content-box;
     border: 2px solid @gray-lighter;
     border-radius: 50%;

assets/css/_site.less

@@ -95,6 +95,10 @@ figure {
   text-align: center;
   font-size: 0.75em;
 
+  .figure-row {
+    margin: 0 auto;
+  }
+
   img {
     display: block;
     margin-right: auto;
@@ -107,12 +111,28 @@ figure {
     float: right;
     margin-right: -12px;
 
+    & + a.figure-link {
+      margin-right: -5px;
+    }
+
     article &::before {
       content: normal;
     }
   }
 }
 
+.figure-row {
+  display: flex;
+  margin: 15px auto;
+  align-items: center;
+  justify-content: space-around;
+  flex-wrap: wrap;
+
+  figure {
+    margin: 0 auto;
+  }
+}
+
 .figure-table {
   margin-left: auto;
   margin-right: auto;
@@ -219,15 +239,21 @@ u {
   position: relative;
 }
 
-/* 视频 */
+/* 视频、音乐 */
 .youtube-video, .bilibili-video {
   margin: 15px auto;
   width: 100%;
   height: auto;
   aspect-ratio: 16/9;
 }
 
-.youtube-video-iframe, .bilibili-video-iframe {
+._163-music {
+  margin: 15px auto;
+  width: 100%;
+  height: 86px;
+}
+
+.youtube-video-iframe, .bilibili-video-iframe, ._163-music-iframe {
   display: block;
   margin: 0 auto;
   width: 100%;

assets/css/base.css

@@ -3,7 +3,7 @@ author: Xzonn
 date: 2009-12-21
 interviewees: 
 - 宫本茂
-last_modified_at: 2022-11-03 20:46
+last_modified_at: 2022-11-04 15:55
 sources: 
 - - https://www.ndw.jp/mario-220913-2/
   - 宮本茂さんに聞く“マリオたちの名前の由来”
@@ -82,9 +82,11 @@ title: 请教宫本茂先生“马力欧们名字的由来”
 栗宝宝也是在开发中叫的名字……那个，栗宝宝真的是蘑菇哟（笑）。但是，因为程序员看起来像栗子（<span lang="ja">栗／くり</span>），所以叫他栗宝宝（<span lang="ja">クリボー</span>）。我是画了蘑菇……它无论怎么看都是香菇吧。等我注意到的时候，周围的人也这么称呼它了，就只能保持这个名字（笑）。之后，根据系列的不同，也有些像栗子一样的画。
 
 ### 慢慢龟&飞行龟
-{% include figure.html src="https://www.mariowiki.com/images/thumb/5/5c/SuperMarioParty_KoopaTroopa.png/474px-SuperMarioParty_KoopaTroopa.png" alt="慢慢龟" width="237" height="300" %}
+<div class="figure-row">
+{% include figure.html src="https://www.mariowiki.com/images/thumb/5/5c/SuperMarioParty_KoopaTroopa.png/474px-SuperMarioParty_KoopaTroopa.png" alt="慢慢龟" width="237" height="300" blank="  " %}
 
-{% include figure.html src="https://www.mariowiki.com/images/thumb/e/e4/Paratroopart.png/465px-Paratroopart.png" alt="飞行龟" width="232.5" height="299.5" %}
+{% include figure.html src="https://www.mariowiki.com/images/thumb/e/e4/Paratroopart.png/465px-Paratroopart.png" alt="飞行龟" width="232.5" height="299.5" blank="  " %}
+</div>
 
 ##### 宫本
 {: .border-red }
@@ -103,11 +105,13 @@ title: 请教宫本茂先生“马力欧们名字的由来”
 > {: #ref-4 }
 
 ### 泡泡鱼
-{% include figure.html src="https://www.mariowiki.com/images/thumb/6/63/CheepCheepNSMBU.png/613px-CheepCheepNSMBU.png" alt="泡泡鱼" width="306.5" height="300" %}
+<div class="figure-row">
+{% include figure.html src="https://www.mariowiki.com/images/thumb/6/63/CheepCheepNSMBU.png/613px-CheepCheepNSMBU.png" alt="泡泡鱼" width="306.5" height="300" blank="  " %}
 
-{% include figure.html src="https://www.mariowiki.com/images/thumb/3/35/NSMBU_Buzzy_Beetle_Artwork.png/687px-NSMBU_Buzzy_Beetle_Artwork.png" alt="钢盔龟" width="343.5" height="299.5" %}
+{% include figure.html src="https://www.mariowiki.com/images/thumb/3/35/NSMBU_Buzzy_Beetle_Artwork.png/687px-NSMBU_Buzzy_Beetle_Artwork.png" alt="钢盔龟" width="343.5" height="299.5" blank="  " %}
 
-{% include figure.html src="https://www.mariowiki.com/images/thumb/3/3e/Spiny_Artwork_-_New_Super_Mario_Bros._2.png/628px-Spiny_Artwork_-_New_Super_Mario_Bros._2.png" alt="刺刺龟" width="314" height="299.5" %}
+{% include figure.html src="https://www.mariowiki.com/images/thumb/3/3e/Spiny_Artwork_-_New_Super_Mario_Bros._2.png/628px-Spiny_Artwork_-_New_Super_Mario_Bros._2.png" alt="刺刺龟" width="314" height="299.5" blank="  " %}
+</div>
 
 ##### 宫本
 {: .border-red }