diff --git a/Gemfile b/Gemfile index 3ba85cff..0baae100 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # This will help ensure the proper Jekyll version is running. # Happy Jekylling! gem "jekyll", "4.4.1" -gem "minimal-mistakes-jekyll", "4.27.3" +gem "minimal-mistakes-jekyll", "4.28.0" group :jekyll_plugins do gem "jekyll-paginate", "1.1.0" diff --git a/_data/settings.yaml b/_data/settings.yaml index e91dd2cd..bd8f1555 100644 --- a/_data/settings.yaml +++ b/_data/settings.yaml @@ -19,6 +19,8 @@ appearance_skin_light: - mint - plum - sunrise + - catppuccin_latte + - catppuccin_mocha appearance_skin_dark: type: radio default: dark @@ -33,3 +35,5 @@ appearance_skin_dark: - mint - plum - sunrise + - catppuccin_latte + - catppuccin_mocha diff --git a/_includes/head.html b/_includes/head.html index f56ebb6b..64861310 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,6 +1,7 @@ +{% assign locale = include.locale | default: site.locale %} -{% include seo.html %} +{% include seo.html locale=locale %} {% unless site.atom_feed.hide %} diff --git a/_layouts/default.html b/_layouts/default.html index e691d2a6..47756075 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,12 +1,13 @@ --- layout: compress --- +{%- assign locale = page.locale | default: layout.locale | default: site.locale %} {% include copyright.html %} - + - {% include head.html %} + {% include head.html locale=locale %} {% include head/custom.html %} @@ -15,8 +16,8 @@
当前站点为预览构建而非官方文档。如需反馈问题，请前往 #{{ site.preview.pr-number }} 留言。
{% endif %} - {% include_cached skip-links.html %} - {% include_cached masthead.html %} + {% include_cached skip-links.html locale=locale %} + {% include_cached masthead.html locale=locale %}
{{ content }} @@ -25,17 +26,17 @@ {% if site.search == true %}
- {% include_cached search/search_form.html %} + {% include_cached search/search_form.html locale=locale %}
{% endif %}
- {% include scripts.html %} + {% include scripts.html locale=locale %} diff --git a/_sass/minimal-mistakes-plus.scss b/_sass/minimal-mistakes-plus.scss index 1d6d0b45..b675223b 100644 --- a/_sass/minimal-mistakes-plus.scss +++ b/_sass/minimal-mistakes-plus.scss @@ -11,10 +11,6 @@ blockquote { word-break: break-word; } -.notice ul:first-child { - margin-top: 0; -} - .task-list-item label { display: inline } diff --git a/assets/css/skins/catppuccin_latte.scss b/assets/css/skins/catppuccin_latte.scss new file mode 100644 index 00000000..59b9147e --- /dev/null +++ b/assets/css/skins/catppuccin_latte.scss @@ -0,0 +1,8 @@ +--- +--- + +@charset "utf-8"; + +$sans-serif: -apple-system, BlinkMacSystemFont, "Roboto", "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; +@import "minimal-mistakes/skins/catppuccin_latte"; +@import "minimal-mistakes-plus"; diff --git a/assets/css/skins/catppuccin_mocha.scss b/assets/css/skins/catppuccin_mocha.scss new file mode 100644 index 00000000..8af24213 --- /dev/null +++ b/assets/css/skins/catppuccin_mocha.scss @@ -0,0 +1,8 @@ +--- +--- + +@charset "utf-8"; + +$sans-serif: -apple-system, BlinkMacSystemFont, "Roboto", "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; +@import "minimal-mistakes/skins/catppuccin_mocha"; +@import "minimal-mistakes-plus"; diff --git a/settings.yaml b/settings.yaml index d8d79aed..159df09b 100644 --- a/settings.yaml +++ b/settings.yaml @@ -16,28 +16,32 @@ data: title: 亮色皮肤 description: 亮色模式下应用的皮肤。 options: - default: 默认 - air: 天空 - aqua: 水蓝 - contrast: 高对比 - dark: 暗色 - dirt: 泥土 - neon: 霓虹 - mint: 薄荷 - plum: 梅紫 - sunrise: 日出 + default: Default + air: Air + aqua: Aque + contrast: Contrast + dark: Dark + dirt: Dirt + neon: Neno + mint: Mint + plum: Plum + sunrise: Sunrise + catppuccin_latte: Catppuccin Latte + catppuccin_mocha: Catppuccin Mocha appearance_skin_dark: title: 暗色皮肤 description: 暗色模式下应用的皮肤。 options: - default: 默认 - air: 天空 - aqua: 水蓝 - contrast: 高对比 - dark: 暗色 - dirt: 泥土 - neon: 霓虹 - mint: 薄荷 - plum: 梅紫 - sunrise: 日出 + default: Default + air: Air + aqua: Aque + contrast: Contrast + dark: Dark + dirt: Dirt + neon: Neno + mint: Mint + plum: Plum + sunrise: Sunrise + catppuccin_latte: Catppuccin Latte + catppuccin_mocha: Catppuccin Mocha ---