Merge branch 'main' into minimal-mistakes-plus

Author: neveler

.github/workflows/pr-preview.yml

@@ -10,8 +10,9 @@ concurrency:
   group: pr-preview
   cancel-in-progress: false
 env:
-  GITHUB_PR_NUMBER: ${{ github.event_name == 'issue_comment' && github.event.issue.number || github.event.pull_request.number }}
   JEKYLL_ENV: production
+  ENABLE_WEBP_AUTO_CONVERSION: "true"
+  GITHUB_PR_NUMBER: ${{ github.event_name == 'issue_comment' && github.event.issue.number || github.event.pull_request.number }}
 jobs:
   cache-refresh:
     if: ${{ !github.event.repository.fork && github.event_name == 'schedule' && github.event.schedule == '0 0 */6 * *' }}

Gemfile

@@ -32,5 +32,4 @@ gem "wdm", "0.2.0", :platforms => [:windows]
 gem "http_parser.rb", "0.8.0", :platforms => [:jruby]
 
 # plugin dependencies
-gem "nokogiri", "1.19.1"
-gem "addressable", "2.8.7"
+gem "webp-ffi", "0.4.0" if ENV["ENABLE_WEBP_AUTO_CONVERSION"] == "true" || ENV["DRONE"] == "true"

_changelogs/dev/3.13/3.13.0.340.md

@@ -0,0 +1,12 @@
+---
+---
+
+[详细版本介绍 (Bilibili)](https://www.bilibili.com/opus/1190023991956340740)
+
+- GP-5930: 增强对 Vulkan 的支持 (by Glavo, 3gf8jv4dv)
+- GP-5931: 支持将新格式快照版本号翻译为文言 (by Glavo)
+- GP-5934: 更新游戏内容下载页游戏版本列表至 26.1.2 (by Glavo)
+
+错误修复:
+
+- GP-5935: 修复日志窗口可能意外的显示横向滚动条的问题 (by Glavo)

_config.yml

@@ -9,6 +9,7 @@
 # data_dir: _data
 # includes_dir: _includes
 # cache_dir: .jekyll-cache
+disable_disk_cache: true
 sass:
   # sass_dir: _sass
   # minimal-mistakes
@@ -105,10 +106,7 @@ defaults:
       path: ""
     values:
       layout: document
-      read_time: false
-      author_profile: false
-      share: false
-      comments: false
+      show_date: true
       sidebar:
         nav: docs
       hits: true

_data/plugins/auto_alert.yml

@@ -5,9 +5,19 @@ appearance_color:
     - light
     - dark
     - auto
-appearance_skin_light:
+appearance_color_switcher:
   type: radio
-  default: default
+  default: enable
+  options:
+    - enable
+    - disable
+appearance_skin:
+  type: multi-radio
+  children:
+    light:
+      default: default
+    dark:
+      default: dark
   options:
     - default
     - air
@@ -23,21 +33,9 @@ appearance_skin_light:
     - catppuccin-frappe
     - catppuccin-macchiato
     - catppuccin-mocha
-appearance_skin_dark:
+miscellaneous_hits:
   type: radio
-  default: dark
+  default: enable
   options:
-    - default
-    - air
-    - aqua
-    - contrast
-    - dark
-    - dirt
-    - neon
-    - mint
-    - plum
-    - sunrise
-    - catppuccin-latte
-    - catppuccin-frappe
-    - catppuccin-macchiato
-    - catppuccin-mocha
+    - enable
+    - disable

_data/settings.yaml

@@ -0,0 +1,2 @@
+zh:
+  follow_label: false

_data/ui-text.yml

@@ -2,12 +2,13 @@
 layout: single
 ---
 
-{% if jekyll.environment == 'production' and page.hits %}
-<img src="https://hits.zkitefly.eu.org/?tag={{ page.url | absolute_url | url_encode }}" alt="Hits" decoding="async">
-{% endif %}
-
-<div class="notice--info">
-  <p>本文由 {{ page.author | default: '未署名用户' }} 创建{% if page.contributors %}，并由 {{ page.contributors | join: ' ' }} 编辑{% endif %}。</p>
-</div>
-
 {{ content }}
+
+{% if page.author or page.contributors or jekyll.environment == 'production' and page.hits  %}
+<script src="{{ '/assets/js/meta.js' | relative_url }}"></script>
+<script>
+  {%- if page.author %}appendMeta("{{ page.author }}", "fas fa-user-pen");{% endif -%}
+  {%- for contributor in page.contributors %}appendMeta("{{ contributor }}", "fas fa-user-pen");{% endfor -%}
+  {%- if jekyll.environment == 'production' and page.hits %}hits("{{ page.url | absolute_url | url_encode }}");{% endif -%}
+</script>
+{% endif %}

_layouts/document.html

@@ -1,46 +1,55 @@
 ---
-layout: document
+layout: single
 ---
 
-{% for group in page.data %}
-
-{% capture notice %}
-
-## {{ group.title }}
-
+{%- for group in page.data %}
+<h2 id="{{ group.title }}">{{ group.title }}</h2>
 {% for pair in group.settings %}
 {% assign name = pair[0] %}
 {% assign value = pair[1] %}
 {% assign setting = site.data.settings[name] %}
-
-{% if setting.type == 'radio' %}
 <div class="notice">
-  <ul class="task-list">
-    <li><strong>{{ value.title }}</strong></li>
-    <li>{{ value.description }}</li>
-    {% for option in setting.options %}
-    <li class="task-list-item">
-      <input type="radio" class="task-list-item-checkbox" name="{{ name }}" value="{{ option }}" id="{{ name }}_{{ option }}"{% if setting.default == option %} checked{% endif %}><label for="{{ name }}_{{ option }}">{{ value.options[option] }}</label>
-    </li>
-    {% endfor %}
-  </ul>
+  <h3 id="{{ name }}">{{ value.title }}</h3>
+  {% if value.description %}<p>{{ value.description }}</p>{% endif %}
+  {% if setting.type == 'radio' %}
+  {% for option in setting.options %}
+  <label>
+    <input type="radio"{% if setting.default == option %} checked{% endif %} class="setting-item" name="{{ name }}" value="{{ option }}">
+    {{ value.options[option] }}
+  </label>
+  {% endfor %}
+  {% elsif setting.type == 'multi-radio' %}
+  <table class="setting-multi-radio">
+    <thead>
+      <tr>
+        <th>{{ value.title }}</th>
+        {% for item in setting.children %}
+        {% capture item_name %}{{ item[0] }}{% endcapture %}
+        <th>{{ value.children[item_name] }}</th>
+        {% endfor %}
+      </tr>
+    </thead>
+    <tbody>
+      {% for option in setting.options %}
+      <tr>
+        <th>{{ value.options[option] }}</th>
+        {% for item in setting.children %}
+        <td><input class="setting-item"{% if item[1].default == option %} checked{% endif %} type="radio" name="{{ name }}.{{ item[0] }}" value="{{ option }}"></td>
+        {% endfor %}
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  {% endif %}
 </div>
+{% endfor %}
+{% endfor %}
 
 <script>
-  settings.onChange("{{ name }}", function (newValue, oldValue) {
-    var list = document.getElementsByName("{{ name }}");
-    for (var i = 0; i < list.length; i++) {
-      list[i].checked = list[i].value === newValue;
-      list[i].onchange = function () {
-        if (this.checked) {
-          settings.set(this.name, this.value);
-        }
-      }
-    }
-  });
+  for (const settingItem of document.getElementsByClassName("setting-item")) {
+    settingItem.addEventListener("change", ({ target }) => settings.set(target.name, target.value));
+    settings.onChange(settingItem.name, (value) => settingItem.type === "radio" && (settingItem.checked = settingItem.value === value));
+  }
 </script>
-{% endif %}
-{% endfor %}
-{% endcapture %}
-{{ notice | markdownify }}
-{% endfor %}
+
+<style>.notice label input { display: inline }</style>