diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md new file mode 100644 index 0000000..f8dd2fa --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -0,0 +1,48 @@ +--- +name: 错误报告(Bug Report) +about: 没有达到预期的效果(Something isn't working as expected) +labels: bug +--- + +请按照此 Issue 模版提供相关信息，例如源码仓库、网站链接和屏幕截图，这将有助于我们进行调查。 +(Please follow this Issue template to provide relevant information, such as source code repository, website URL and screenshots, which will help us investigate.) + + +## 问题自检列表 (Issue Checklist) + +> 请确认如下情况已检查，并将 [ ] 换成 [x] 来选择 (Change [ ] to [x] to selected which your could make sure) + +- [ ] 已使用 Hugo Extended 0.86.0 或更高的版本 (I'm using Hugo Extended version 0.86.0 or later) +- [ ] 已使用 Hugo NexT 4.0 或更高的版本 (I'm using Hugo NexT version 4.0 or later) +- [ ] 已阅读 [Hugo 故障排除](https://gohugo.io/troubleshooting/)并尝试修复无果 (I had already read the [Troubleshooting page of Hugo](https://gohugo.io/troubleshooting/)) +- [ ] 已搜索过当前所有[已知问题](https://github.com/hugo-next/hugo-theme-next/issues)和[讨论区](https://github.com/hugo-next/hugo-theme-next/discussions/categories/q-a) ，但没有找到帮助 (I had already searched for current [Issues](https://github.com/hugo-next/hugo-theme-next/issues) and [Q & A](https://github.com/hugo-next/hugo-theme-next/discussions/categories/q-a), which does not help me.) + +*** + +## 预期行为 (Expected behavior) + +> 请描述你想实现的预期效果 (Please describe the expected behavior what you want) + + +## 实际行为 (Actual behavior) + +> 请同时提供网站链接、屏幕截图和源码地址 (Please provide your site links, screenshots and code repository) + + +## 问题重现步骤 (Steps to reproduce the behavior) + + + +## 环境信息 (Environment Information) + +### 主题配置(Configuration) + +> 提供主题 `config.yaml` 中修改过的部分内容 (Paste ONLY CHANGED CONFIGURATION from `config.yaml`) + +```yaml + +``` + +## 其他有用信息 (Other Information) + +> 例如：操作系统、浏览器等 (e.g. Browser, System) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..38000e8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: GitHub Discussions + url: https://github.com/hugo-next/hugo-theme-next/discussions/categories/q-a + about: 请在此处提问或回答问题(Please ask and answer questions here) \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md new file mode 100644 index 0000000..81e2772 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -0,0 +1,15 @@ +--- +name: 新功能请求(Feature Request) +about: Suggest an idea for this project +labels: feature request +--- + +请按照此新功能模版提供相关信息，如详细的功能描述或同类效果屏幕截图，这将有助于我们进行调查。 +(Please follow this new feature template to provide relevant information, such as detail description for feature or some screenshots, which will help us investigate.) + + +## 新功能描述 (New feature description) + + +## 效果参考截图 (Screenshots if it possible) + diff --git a/.gitignore b/.gitignore index 470f243..1a75d43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Ignore files in Hugo NexT theme -.hugo_build.lock - -exampleSite/public -exampleSite/resources \ No newline at end of file +exampleSite/ +!exampleSite/content +!exampleSite/start.sh +!exampleSite/config.yaml \ No newline at end of file diff --git a/README.md b/README.md index cd4ff8f..79a0b81 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,119 @@ -# Hugo theme of NexT +[中文](README.zh.md) | [English](#) -![hugo-next-primary](https://lisenhui.gitee.io/imgs/hugo-next/logo/hugo-next-primary.png) + + NexT logo + -Start a new journey for Hugo's theme of NexT. +## Hugo NexT -# Our Vision +«Hugo NexT» is a high quality elegant [Hugo](https://gohugo.io) theme. Migrate it from `Hexo` engine themes which name is [`NexT`](https://github.com/next-theme/hexo-theme-next), keep all kind page layout designs and 4 different shcemes, start new journey with :heart: and hope you would like it. -Make `NexT` theme is easily & powerful. +> All page designs & configuration compatibility with Hexo NexT, it's very easy migrate your site from Hexo to Hugo and enjoy yourself. -# Preview +[![Gitter](https://img.shields.io/gitter/room/hugo-next/hugo-them-next?logo=gitter&style=flat-square)](https://gitter.im/hugo-next/community) [![Build Hugo Version](https://img.shields.io/badge/Hugo-%3E=0.86.0-red?style=flat-square&logo=hugo&color=%23FF4088)](https://github.com/gohugoio/hugo/releases/latest) [![GitHub deployments](https://img.shields.io/github/deployments/hugo-next/hugo-next.github.io/github-pages?style=flat-square&label=gh-pg&logo=GitHub)](https://github.com/hugo-next/hugo-theme-next) [![Repos Size](https://img.shields.io/github/repo-size/hugo-next/hugo-theme-next?style=flat-square&color=%23FFBF3B&logo=Files)](https://github.com/hugo-next/hugo-theme-next/find/main) [![GitHub](https://img.shields.io/github/license/hugo-next/hugo-theme-next?logo=webauthn&style=flat-square)](https://github.com/hugo-next/hugo-theme-next/blob/main/LICENSE) + +## 4 Scheme + +* :heart_decoration: Muse +* :six_pointed_star: Mist +* :pisces: Pisces +* :gemini: Gemini (**default**) + +## Live Preview | Environment | :gemini: (**Default**) | :heart_decoration: | :six_pointed_star: | :pisces: | Status | | :---: | :---: | :---: | :---: | :---: | :---: | -| Preliminary | [Gemini](https://hugo-next-dev.vercel.app/) | [Muse](https://hugo-next-dev.vercel.app/muse/) | [Mist](https://hugo-next-dev.vercel.app/mist/) | [Pisces](https://hugo-next-dev.vercel.app/pisces/) | ![Vercel](https://therealsujitk-vercel-badge.vercel.app/?app=hugo-next-dev&style=for-the-badge) | -| Production | [Gemini](https://hugo-next-prod.vercel.app/) | [Muse](https://hugo-next-prod.vercel.app/muse/) | [Mist](https://hugo-next-prod.vercel.app/mist/) | [Pisces](https://hugo-next-prod.vercel.app/pisces/) | ![Vercel](https://therealsujitk-vercel-badge.vercel.app/?app=hugo-next-prod&style=for-the-badge) | \ No newline at end of file +| Preliminary | [Gemini](https://preview.hugo-next.eu.org/) | [Muse](https://preview.hugo-next.eu.org/muse/) | [Mist](https://preview.hugo-next.eu.org/mist/) | [Pisces](https://preview.hugo-next.eu.org/pisces/) | ![Vercel](https://therealsujitk-vercel-badge.vercel.app/?app=preview-hugo-next&style=for-the-badge) | +| Production | [Gemini](https://hugo-next.eu.org/) | [Muse](https://hugo-next.eu.org/muse/) | [Mist](https://hugo-next.eu.org/mist/) | [Pisces](https://hugo-next.eu.org/pisces/) | ![Vercel](https://therealsujitk-vercel-badge.vercel.app/?app=hugo-next&style=for-the-badge) | + +> Preliminary: all new feature developments will be previewed as soon as possible. +> Production: Only the features that are tested stably and meet the requirements will be officially released. + +## Quick Start + +Before use `Hugo NexT` theme, please make sure installed `Git` & `Hugo Extened` software in your PC, then use `submodule` to lead into the theme, see below commands: + +```shell +$ hugo new site hugo-next-exmaple +$ cd hugo-next-exmaple +$ git init +$ hugo submodule add https://github.com/hugo-next/hugo-theme-next.git themes/hugo-theme-next +$ cp -r themes/hugo-theme-next/exampleSite/* . +$ rm -rf config.toml +$ hugo server +``` + +Done that input adrress http://127.0.0.1:1313/ on browser will see the effect & good luck for you! :tada::tada::tada: + +## New Post + +There had ready a new post template for you, It is recommended to use the following Hugo command to quickly create a new post: + +```sh +$ hugo new posts/hello-world.md +``` + +Descript front matter in post as below: + + +```yml +--- +title: "{{ replace .Name "-" " " | title }}" +description: "{{ .Name }}" +keywords: "{{replace .Name "-" ","}}" + +date: {{ .Date }} +lastmod: {{ .Date }} + +categories: + - +tags: + - + - + +# Post's origin author name +#author: +# Post's origin link URL +#link: +# Image source link that will use in open graph and twitter card +#imgs: +# Expand content on the home page +#expand: true +# It's means that will redirecting to external links +#extlink: +# Switch to enabled or disabled comment plugins in this post +#comment: +# enable: false +# Enable table of content +#toc: false +# Absolute link for visit +#url: "{{ lower .Name }}.html" +# Sticky post set-top in home page and the smaller nubmer will more forward. +#weight: 1 +--- +``` + +## Feedback + +- Join us [GitHub Discussions](https://github.com/hugo-next/hugo-theme-next/discussions) or [Gitter](https://gitter.im/hugo-next/community) to chat :beers: +- [GitHub Issues](https://github.com/hugo-next/hugo-theme-next/issues/new?labels=Bug&template=bug-report.md) submit a new bug :bug: +- [GitHub Feature](https://github.com/hugo-next/hugo-theme-next/issues/new?labels=Feature+Request&template=feature-request.md) tell me your ideas :sparkles: + +## Join us + +All features development progress and new request in [Hugo NexT V4 Roadmap](https://github.com/hugo-next/hugo-theme-next/issues/9), welcome to join us and compelete it together. + +## License + +[MIT License](LICENSE) + +## Thanks + +That's my hobby to develop `Hugo NexT` theme, thanks all people who gived the donate, and let we follow it growth up. + +List of Donors(Order by Date): + +| Donation time | Donors | Donation mode | Donation content | Message | +| ------- | ------ | ------ | ---- | ---- | +| 2021.12.21 | z*y | wechat pay | RMB 18.88 | / | +| 2022.05.08 | *泉 | wechat pay | RMB 6.60 | Good luck with next develop. | \ No newline at end of file diff --git a/README.zh.md b/README.zh.md new file mode 100644 index 0000000..32011f6 --- /dev/null +++ b/README.zh.md @@ -0,0 +1,125 @@ +[中文](#) | [English](README.md) + + + NexT logo + + +## Hugo NexT + +«Hugo NexT» 是一款高质量且优雅的 [Hugo](https://gohugo.io) 主题，从原来 `Hexo` 引擎的 [`NexT`](https://github.com/next-theme/hexo-theme-next) 主题中移植过来，继续保留其经典的设计和 4 种不同页面布局模式，一切因 :heart: 重新出发愿你也能喜欢。 + +> 本主题的所有页面设计和配置项都与原来 `Hexo` 引擎的 `NexT` 主题保持了良好的兼容性，可以非常平滑的从 `Hexo` 迁移至 `Hugo` 引擎，欢迎大家使用并反馈。 + +[![Gitter](https://img.shields.io/gitter/room/hugo-next/hugo-them-next?logo=gitter&style=flat-square)](https://gitter.im/hugo-next/community) [![Build Hugo Version](https://img.shields.io/badge/Hugo-%3E=0.86.0-red?style=flat-square&logo=hugo&color=%23FF4088)](https://github.com/gohugoio/hugo/releases/latest) [![GitHub deployments](https://img.shields.io/github/deployments/hugo-next/hugo-next.github.io/github-pages?style=flat-square&label=gh-pg&logo=GitHub)](https://github.com/hugo-next/hugo-theme-next) [![Repos Size](https://img.shields.io/github/repo-size/hugo-next/hugo-theme-next?style=flat-square&color=%23FFBF3B&logo=Files)](https://github.com/hugo-next/hugo-theme-next/find/main) [![GitHub](https://img.shields.io/github/license/hugo-next/hugo-theme-next?logo=webauthn&style=flat-square)](https://github.com/hugo-next/hugo-theme-next/blob/main/LICENSE) + +## 4 种页面模式 + +* :heart_decoration: 冥想 (Muse) +* :six_pointed_star: 迷雾 (Mist) +* :pisces: 双鱼座 (Pisces) +* :gemini: 双子座 (Gemini) (**默认**) + +## 在线预览 + +| 环境 | :gemini: (**Default**) | :heart_decoration: | :six_pointed_star: | :pisces: | 状态 | +| :---: | :---: | :---: | :---: | :---: | :---: | +| 开发版本 | [双子座](https://preview.hugo-next.eu.org/) | [冥想](https://preview.hugo-next.eu.org/muse/) | [迷雾](https://preview.hugo-next.eu.org/mist/) | [双鱼座](https://preview.hugo-next.eu.org/pisces/) | ![Vercel](https://therealsujitk-vercel-badge.vercel.app/?app=hugo-next&style=for-the-badge) | +| 正式版本 | [双子座](https://hugo-next.eu.org/) | [冥想](https://hugo-next.eu.org/muse/) | [迷雾](https://hugo-next.eu.org/mist/) | [双鱼座](https://hugo-next.eu.org/pisces/) | ![Vercel](https://therealsujitk-vercel-badge.vercel.app/?app=hugo-next&style=for-the-badge) | + +> 开发版本： 所有的新功能开发都会在此第一时间发布预览 +> 正式版本： 只有测试稳定且符合要求的功能才会正式发布 + +## 快速开始 + +在使用 `Hugo NexT` 主题之前，请确认你的电脑上已经安装 `Git` 和 `Hugo Extened` 两款软件，然后通过 `submodule` 模式引用本主题，参考如下命令： + +```shell +$ hugo new site hugo-next-exmaple +$ cd hugo-next-exmaple +$ git init +$ hugo submodule add https://github.com/hugo-next/hugo-theme-next.git themes/hugo-theme-next +$ cp -r themes/hugo-theme-next/exampleSite/* . +$ rm -rf config.toml +$ hugo server +``` +打开浏览器，在地址栏输入 http://127.0.0.1:1313/ 查看主题效果，祝你好运！:tada::tada::tada: + +> 本主题的代码同时也同步到 `Gitee` 仓库，在国内环境可切换用 [https://gitee.com/hugo-next/hugo-theme-next.git](https://gitee.com/hugo-next/hugo-theme-next.git) 镜像速度更快，也更稳定。 + +## 发表新文章 + +主题已经配置了默认的文章模板，建议使用如下 Hugo 命令快速创建新的文章： + +```sh +$ hugo new posts/hello-world.md +``` + +关于文章头部的那些标记作用的说明参考如下： + + +```yml +--- +# 文章标题 +title: "{{ replace .Name "-" " " | title }}" +# 文章内容摘要 +description: "{{ .Name }}" +# 文章内容关键字 +keywords: "{{replace .Name "-" ","}}" +# 发表日期 +date: {{ .Date }} +# 最后修改日期 +lastmod: {{ .Date }} +# 分类 +categories: + - +# 标签 +tags: + - + - + +# 原文作者 +#author: +# 原文链接 +#link: +# 图片链接，用在open graph和twitter卡片上 +#imgs: +# 在首页展开内容 +#expand: true +# 外部链接地址，访问时直接跳转 +#extlink: +# 在当前页面开启或关闭评论功能 +#comment: +# enable: false +# 开启文章目录功能 +#toc: false +# 绝对访问路径 +#url: "{{ lower .Name }}.html" +# 开启文章置顶，数字越小越靠前 +#weight: 1 +--- +``` + +## 使用反馈 + +- 加入 [GitHub Discussions](https://github.com/hugo-next/hugo-theme-next/discussions) 或 [Gitter](https://gitter.im/hugo-next/community) 在线讨论 :beers: +- [GitHub Issues](https://github.com/hugo-next/hugo-theme-next/issues/new?labels=Bug&template=bug-report.md) 提交错误报告 :bug: +- [GitHub Feature](https://github.com/hugo-next/hugo-theme-next/issues/new?labels=Feature+Request&template=feature-request.md) 表新功能的想法 :sparkles: + +## 欢迎加入 + +关于本主题的开发进度和后续的发展路线图，可访问 [Hugo NexT V4 Roadmap](https://github.com/hugo-next/hugo-theme-next/issues/9) 查看详情，也欢迎大家参与一起来完善。 + +## 许可证 + +[MIT License](LICENSE) + +## 致谢 + +开发 `Hugo NexT` 主题原本是个人的业余爱好，但没想到网友们这么的热情，感谢有你们的支持，让我们一起来见证它的成长。 + +以下是捐助名单列表（按时间顺序）： + +| 捐助时间 | 捐助者 | 捐助方式 | 捐助内容 | 留言 | +| :-------: | ------ | ------ | ---- | ---- | +| 2021.12.21 | z*y | 微信支付 | ¥18.88 | / | +| 2022.05.08 | *泉 | 微信支付 | ¥6.60 | 祝开发next顺利 | \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..0c89fc9 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +4.0.0 \ No newline at end of file diff --git a/assets/css/_common/components/third-party/utterances.scss b/assets/css/_common/components/third-party/utterances.scss index d324d55..c888764 100644 --- a/assets/css/_common/components/third-party/utterances.scss +++ b/assets/css/_common/components/third-party/utterances.scss @@ -1,5 +1,7 @@ -@if $utterances_enable { - .utterances { - max-width: unset; - } -} +// TODO maybe use for next time +// @if $utterances_enable { +// .utterances { +// max-width: unset; +// min-height: 300px; +// } +// } diff --git a/assets/css/_common/outline/footer/index.scss b/assets/css/_common/outline/footer/index.scss index 154186c..1c6964a 100644 --- a/assets/css/_common/outline/footer/index.scss +++ b/assets/css/_common/outline/footer/index.scss @@ -21,6 +21,14 @@ @include flex-column(); @include main-container(); + @include mobile() { + font-size: $font-size-smaller; + } + + @include mobile-small() { + font-size: $font-size-smallest; + } + @if $footer_vendors_enable { .vendors-list { a { @@ -30,6 +38,19 @@ img { display: inline-block; } + + $footer_vendors_imgs_len: length($footer_vendors_imgs_width); + @if ($footer_vendors_imgs_len>0) { + @for $i from 1 through $footer_vendors_imgs_len { + a:nth-child(#{$i}) img { + width: #{nth($footer_vendors_imgs_width, $i)}px; + + @include mobile() { + width: #{nth($footer_vendors_imgs_width, $i)-10}px; + } + } + } + } } } } @@ -40,24 +61,6 @@ } } -@keyframes icon-animate { - 0%, 100% { - transform: scale(1); - } - - 10%, 30% { - transform: scale(.9); - } - - 20%, 40%, 60%, 80% { - transform: scale(1.1); - } - - 50%, 70% { - transform: scale(1.1); - } -} - .languages { display: inline-block; font-size: $font-size-large; @@ -83,7 +86,7 @@ margin: 0 5px; @if $footer_icon_animated { - animation: icon-animate 1.33s ease-in-out infinite; + animation: beat 1.33s ease-in-out infinite; } } diff --git a/static/css/hover.css b/assets/css/_common/scaffolding/animation/hover.scss similarity index 100% rename from static/css/hover.css rename to assets/css/_common/scaffolding/animation/hover.scss diff --git a/assets/css/_common/scaffolding/animation/icon.scss b/assets/css/_common/scaffolding/animation/icon.scss new file mode 100644 index 0000000..704c6f3 --- /dev/null +++ b/assets/css/_common/scaffolding/animation/icon.scss @@ -0,0 +1,17 @@ +@keyframes beat { + 0%, 100% { + transform: scale(1); + } + + 10%, 30% { + transform: scale(.9); + } + + 20%, 40%, 60%, 80% { + transform: scale(1.1); + } + + 50%, 70% { + transform: scale(1.1); + } +} \ No newline at end of file diff --git a/assets/css/_common/scaffolding/animation/index.scss b/assets/css/_common/scaffolding/animation/index.scss new file mode 100644 index 0000000..5df9ebe --- /dev/null +++ b/assets/css/_common/scaffolding/animation/index.scss @@ -0,0 +1,3 @@ +@import 'icon'; +@import 'show'; +@import 'hover'; \ No newline at end of file diff --git a/assets/css/_common/scaffolding/animation/show.scss b/assets/css/_common/scaffolding/animation/show.scss new file mode 100644 index 0000000..4c0fd6b --- /dev/null +++ b/assets/css/_common/scaffolding/animation/show.scss @@ -0,0 +1,65 @@ +// tabshow animation +@-moz-keyframes tabshow { + 0% { + -webkit-transform: translateY(15px); + -moz-transform: translateY(15px); + -o-transform: translateY(15px); + -ms-transform: translateY(15px); + transform: translateY(15px); + } + 100% { + -webkit-transform: translateY(0); + -moz-transform: translateY(0); + -o-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + } +} +@-webkit-keyframes tabshow { + 0% { + -webkit-transform: translateY(15px); + -moz-transform: translateY(15px); + -o-transform: translateY(15px); + -ms-transform: translateY(15px); + transform: translateY(15px); + } + 100% { + -webkit-transform: translateY(0); + -moz-transform: translateY(0); + -o-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + } +} +@-o-keyframes tabshow { + 0% { + -webkit-transform: translateY(15px); + -moz-transform: translateY(15px); + -o-transform: translateY(15px); + -ms-transform: translateY(15px); + transform: translateY(15px); + } + 100% { + -webkit-transform: translateY(0); + -moz-transform: translateY(0); + -o-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + } +} +@keyframes tabshow { + 0% { + -webkit-transform: translateY(15px); + -moz-transform: translateY(15px); + -o-transform: translateY(15px); + -ms-transform: translateY(15px); + transform: translateY(15px); + } + 100% { + -webkit-transform: translateY(0); + -moz-transform: translateY(0); + -o-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + } +} \ No newline at end of file diff --git a/assets/css/_common/scaffolding/comments.scss b/assets/css/_common/scaffolding/comments.scss index a0402cd..3891762 100644 --- a/assets/css/_common/scaffolding/comments.scss +++ b/assets/css/_common/scaffolding/comments.scss @@ -43,8 +43,32 @@ margin-top: 60px; } + min-height: 300px; overflow: hidden; + .comment-loading { + @if $sidebar_position == 'right' { + padding-right: $sidebar-desktop + $sidebar-offset; + } @else { + padding-left: $sidebar-desktop + $sidebar-offset; + } + + position: absolute; + left: 0; + right: 0; + margin-left: auto; + margin-right: auto; + margin-top: 100px; + text-align: center; + font-size: 2em; + + @include tablet-mobile() { + padding-left: 0; + padding-right: 0; + width: auto; + } + } + .comment-head { margin-bottom: 20px; @@ -53,6 +77,9 @@ vertical-align: middle; font-weight: 700; font-size: 1.4em; + @include mobile-small() { + font-size: $font-size-smaller; + } } @if $two_comments_enable { @@ -61,16 +88,16 @@ float: right; margin: 2px auto; padding: 4px 16px; + @include mobile-small() { + font-size: $font-size-smaller; + padding: 4px; + } width: max-content; border-radius: 8px; - background: #eee; + background: var(--card-bg-color); .first-comment { color: $first_comment_color; - - @if $two_comments_actived==$first_comment_name { - font-weight: bold; - } } .second-comment { @@ -82,11 +109,12 @@ } $switch_btn_bg_color: $first_comment_color; + $switch_btn_move_bc: $second_comment_color; .switch-btn { position: relative; display: inline-block; - margin: -4px 8px 0; + margin: 5px; width: 42px; height: 22px; border-radius: 34px; @@ -100,6 +128,7 @@ @if $two_comments_actived==$second_comment_name { $switch_btn_bg_color: $second_comment_color; + $switch_btn_move_bc: $first_comment_color; } background-color: $switch_btn_bg_color; @@ -120,7 +149,11 @@ transition: .4s } - &.move:before { + &.move { + background-color: $switch_btn_move_bc; + } + + &.move:before { -webkit-transform: translateX(20px); -moz-transform: translateX(20px); -o-transform: translateX(20px); @@ -129,6 +162,7 @@ } } } + } } diff --git a/assets/css/_common/scaffolding/highlight/copy-code.scss b/assets/css/_common/scaffolding/highlight/copy-code.scss index 0b28ff4..63d538c 100644 --- a/assets/css/_common/scaffolding/highlight/copy-code.scss +++ b/assets/css/_common/scaffolding/highlight/copy-code.scss @@ -1,40 +1,57 @@ -.highlight:hover .copy-btn, pre:hover .copy-btn { - opacity: 1; -} -.copy-btn { - color: $black-dim; - cursor: pointer; - line-height: 1.6; - opacity: 0; - padding: 2px 6px; - position: absolute; - transition: opacity $transition-ease; +.highlight { - @if $codeblock_copy_btn_style == 'flat' { - background: white; - border: 0; - font-size: $font-size-smaller; - right: 0; - top: 0; - } @else if $codeblock_copy_btn_style == 'mac' { - color: var(--highlight-foreground); - font-size: 14px; - right: 0; - top: 2px; - } @else { - background-color: $gainsboro; - background-image: linear-gradient(#fcfcfc, $gainsboro); - border: 1px solid #d5d5d5; - border-radius: 3px; - font-size: $font-size-smaller; - right: 4px; - top: 8px; + background: var(--highlight-background); + + .table-container, pre { + position: relative; + } + + .table-container table tbody tr { + background: none; } } -@if $codeblock_copy_btn_style == 'mac' { - figure.highlight { +@if $codeblock_copy_btn_enable { + + .highlight:hover .copy-btn, pre:hover .copy-btn { + opacity: 1; + } + + .copy-btn { + color: $black-dim; + cursor: pointer; + line-height: 1.6; + opacity: 0; + padding: 2px 6px; + position: absolute; + right: 8px; + top: 4px; + transition: opacity $transition-ease; + background: var(--highlight-background); + + @if $codeblock_style == 'flat' { + background: white; + border: 0; + font-size: $font-size-smaller; + + } @else if $codeblock_style == 'mac' { + color: var(--highlight-foreground); + font-size: 14px; + border-radius: 3px; + } @else { + background-color: $gainsboro; + background-image: linear-gradient(#fcfcfc, $gainsboro); + border: 1px solid #d5d5d5; + border-radius: 3px; + font-size: $font-size-smaller; + + } + } +} + +@if $codeblock_style == 'mac' { + .highlight { border-radius: 5px; box-shadow: 0 10px 30px 0 rgba(0, 0, 0, .4); padding-top: 30px; @@ -46,10 +63,10 @@ &::before { background: #fc625d; box-shadow: 20px 0 #fdbc40, 40px 0 #35cd4b; - left: 12px; margin-top: -20px; + margin-left: 10px; position: absolute; @include round-icon(12px); } } -} +} \ No newline at end of file diff --git a/assets/css/_common/scaffolding/highlight/index.scss b/assets/css/_common/scaffolding/highlight/index.scss index 8181783..68c6fcc 100644 --- a/assets/css/_common/scaffolding/highlight/index.scss +++ b/assets/css/_common/scaffolding/highlight/index.scss @@ -1,58 +1,25 @@ -// Use `@use` to fix issue #67 -// TODO find way to import file by dynmatic -// @import '(theme.highlight.enable && theme.highlight.light.file) ? theme.highlight.light.file : null'; -// @import '(theme.prism.enable && theme.prism.light) ? theme.prism.light : null'; -// @import '(theme.prism.enable && theme.prism.number) ? theme.prism.number : null'; +@import 'copy-code'; -/* @media (prefers-color-scheme: dark) { - @import '(theme.darkmode && theme.highlight.enable && theme.highlight.dark.file) ? theme.highlight.dark.file : null'; - @import '(theme.darkmode && theme.prism.enable && theme.prism.dark) ? theme.prism.dark : null'; -} */ - -// @import 'theme.codeblock.copy_button.enable ? "copy-code" : null'; - -// Placeholder: %code-inline %code-block %code-inline { background: var(--highlight-background); color: var(--highlight-foreground); } -%code-block { - @extend %code-inline; - line-height: $line-height-code-block; - margin: 0 auto 20px; +pre { + padding: 10px; + margin: 0; } -%figcaption { - background: var(--highlight-gutter-background); - color: var(--highlight-foreground); - display: flow-root; - font-size: $table-font-size; - line-height: 1.2; - padding: .5em; - - a { - color: var(--highlight-foreground); - float: right; - - &:hover { - border-bottom-color: var(--highlight-foreground); - } - } +p > code, li > code { + @extend %code-inline; + border-radius: 3px; + padding: 3px 6px; } pre, code { font-family: $code-font-family; - color: #fff; } -code { - @extend %code-inline; - border-radius: 3px; - font-size: $table-font-size; - padding: 2px 4px; - @include word-wrap(); -} kbd { @extend %code-inline; @@ -62,82 +29,4 @@ kbd { font-family: inherit; padding: .1em .3em; white-space: nowrap; - color: #fff; -} - -// `highlight.line_number: false` and `highlight.wrap: false` -// in Hexo config generates code.highlight elements -figure.highlight { - @extend %code-block; - position: relative; - - pre { - border: 0; - margin: 0; - padding: 10px 0; - } - - table { - border: 0; - margin: 0; - width: auto; - } - - td { - border: 0; - padding: 0; - } - - figcaption { - @extend %figcaption; - } - - .gutter { - @include disable-user-select(); - - pre { - background: var(--highlight-gutter-background); - color: var(--highlight-gutter-foreground); - padding-left: 10px; - padding-right: 10px; - text-align: right; - } - } - - .code pre { - padding-left: 10px; - width: 100%; - } - - // See https://github.com/next-theme/hexo-theme-next/discussions/410 - .marked { - background: rgba(0, 0, 0, .3); - } -} - -// See https://github.com/hexojs/hexo-util/pull/229 -pre .caption, pre figcaption { - @extend %figcaption; - margin-bottom: 10px; -} - -.gist table { - width: auto; - - td { - border: 0; - } -} - -pre { - @extend %code-block; - overflow: auto; - padding: 10px; - position: relative; - - code { - background: none; - padding: 0; - text-shadow: none; - } -} +} \ No newline at end of file diff --git a/assets/css/_common/scaffolding/index.scss b/assets/css/_common/scaffolding/index.scss index 5cd24ed..2fb5cb7 100644 --- a/assets/css/_common/scaffolding/index.scss +++ b/assets/css/_common/scaffolding/index.scss @@ -11,3 +11,4 @@ @import 'pagination'; @import 'comments'; @import 'fontawesome'; +@import 'animation'; diff --git a/assets/css/_mixins.scss b/assets/css/_mixins.scss index 9e435a8..10b2ebe 100644 --- a/assets/css/_mixins.scss +++ b/assets/css/_mixins.scss @@ -64,7 +64,7 @@ } @mixin sidebar-inline-links-item() { - margin: 5px 0 0; + margin: 5px 0; a { box-sizing: border-box; diff --git a/assets/css/_schemes/Pisces/_sidebar.scss b/assets/css/_schemes/Pisces/_sidebar.scss index c8a5715..d3ec63c 100644 --- a/assets/css/_schemes/Pisces/_sidebar.scss +++ b/assets/css/_schemes/Pisces/_sidebar.scss @@ -75,7 +75,7 @@ @if $links_settings_layout == 'inline' { display: inline-block; max-width: 100%; - @include sidebar-inline-links-item(); + margin: 5px; } } @@ -83,7 +83,7 @@ // Only when back2top.sidebar is true, apply the following styles .back-to-top { background: var(--body-bg-color); - margin: 8px - $sidebar-offset -10px -18px; + margin: 8px -#{$sidebar-offset} -10px -18px; &.back-to-top-on { margin-top: 16px; diff --git a/assets/css/main.scss b/assets/css/main.scss index b214e0a..718a92c 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -1,136 +1,150 @@ -// CSS Style Guide: https://codeguide.co/#css +// CSS Style Guide : https://codeguide.co/#css // All variables from site's config content. {{- $P := .Site.Params }} // Base -$scheme: {{ $P.scheme }}; -$darkmode: {{ $P.darkmode }}; +$scheme : {{ $P.scheme }}; +$darkmode : {{ $P.darkmode }}; -$body_scrollbar_overlay: {{ $P.bodyScrollbar.overlay }}; -$body_scrollbar_stable: {{ $P.bodyScrollbar.stable }}; -$mermaid_enable: {{ $P.mermaid.enable }}; -$mobile_layout_economy: {{ $P.mobileLayoutEconomy }}; -$theme_color_dark: {{ $P.themeColor.dark }}; -$theme_color_light: {{ $P.themeColor.light }}; +$body_scrollbar_overlay : {{ $P.bodyScrollbar.overlay }}; +$body_scrollbar_stable : {{ $P.bodyScrollbar.stable }}; +$mermaid_enable : {{ $P.mermaid.enable }}; +$mobile_layout_economy : {{ $P.mobileLayoutEconomy }}; +$theme_color_dark : {{ $P.themeColor.dark }}; +$theme_color_light : {{ $P.themeColor.light }}; // Header -$bookmark_color: {{ $P.bookmark.color }}; -$bookmark_enable: {{ $P.bookmark.enable }}; -$github_banner_enable: {{ $P.githubBanner.enable }}; -$menu_settings_badges: {{ $P.menuSets.badges }}; +$bookmark_color : {{ $P.bookmark.color }}; +$bookmark_enable : {{ $P.bookmark.enable }}; +$github_banner_enable : {{ $P.githubBanner.enable }}; +$menu_settings_badges : {{ $P.menuSets.badges }}; // Footer -$footer_icon_color: {{ $P.footer.icon.color }}; -$footer_icon_animated: {{ $P.footer.icon.animated }}; -$footer_beian_enable: {{ $P.footer.beian.enable }}; -$footer_vendors_enable: {{ isset $P.footer "vendors" }}; +$footer_icon_color : {{ $P.footer.icon.color }}; +$footer_icon_animated : {{ $P.footer.icon.animated }}; +$footer_beian_enable : {{ $P.footer.beian.enable }}; +$footer_vendors_enable : {{ isset $P.footer "vendors" }}; +{{ with $P.footer.vendors }} +{{ $width := slice "start" }} +{{ range .list }} +{{ if .image }} +{{ $width = $width | append .image.width }} +{{ end }} +{{ end }} +{{ printf "$footer_vendors_imgs_width:%s;" (delimit (after 1 $width) ", ") }} +{{ end }} // Counter -$busuanzi_enable: {{ $P.busuanzi.enable }}; -$busuanzi_visitors: {{ $P.busuanzi.visitors }}; -$busuanzi_views: {{ $P.busuanzi.views }}; -$busuanzi_post_views: {{ $P.busuanzi.postViews }}; +$busuanzi_enable : {{ $P.busuanzi.enable }}; +$busuanzi_visitors : {{ $P.busuanzi.visitors }}; +$busuanzi_views : {{ $P.busuanzi.views }}; +$busuanzi_post_views : {{ $P.busuanzi.postViews }}; // Font -$font_enable: {{ $P.font.enable }}; -$font_global_size: {{ default $P.font.global.size 1 }}; -$font_headings_size: {{ default $P.font.headings.size 1.625 }}; -$font_title_size: {{ default $P.font.title.size 1.375 }}; +$font_enable : {{ $P.font.enable }}; +$font_global_size : {{ default $P.font.global.size 1 }}; +$font_headings_size : {{ default $P.font.headings.size 1.625 }}; +$font_title_size : {{ default $P.font.title.size 1.375 }}; // Code & Code blocks // TODO find the configure variable -$highlight_dark_background: #000; -$highlight_dark_foreground: #222; -$highlight_light_background: #000; -$highlight_light_foreground: #222; +$highlight_dark_background : #1c1b1b; +$highlight_dark_foreground : #fff; +$highlight_light_background : #565656; +$highlight_light_foreground : #fff; -$codeblock_copy_btn_style: {{ $P.codeblock.copyBtn.style }}; +$codeblock_copy_btn_enable : {{ $P.codeblock.copyBtn }}; +$codeblock_style : {{ $P.codeblock.style }}; // Sidebar -$sidebar_offset: {{ $P.sidebar.offset }}; -$sidebar_padding: {{ $P.sidebar.padding }}; -$sidebar_position: {{ $P.sidebar.position }}; -$sidebar_width: {{ $P.sidebar.width }}; +$sidebar_offset : {{ $P.sidebar.offset }}; +$sidebar_padding : {{ $P.sidebar.padding }}; +$sidebar_position : {{ $P.sidebar.position }}; +$sidebar_width : {{ $P.sidebar.width }}; -$motion_enable: {{ $P.motion.enable }}; -$motion_transition_sidebar: {{ $P.motion.transition.sidebar }}; +$motion_enable : {{ $P.motion.enable }}; +$motion_transition_sidebar : {{ $P.motion.transition.sidebar }}; -$back2top_enable: {{ $P.backTop.enable }}; -$back2top_scrollpercent: {{ $P.backTop.scrollpercent }}; -$back2top_sidebar: {{ $P.backTop.sidebar }}; +$back2top_enable : {{ $P.backTop.enable }}; +$back2top_scrollpercent : {{ $P.backTop.scrollpercent }}; +$back2top_sidebar : {{ $P.backTop.sidebar }}; -$avatar_rotated: {{ $P.avatar.rotated }}; -$avatar_rounded: {{ $P.avatar.rounded }}; -$avatar_rounded: {{ $P.avatar.rounded }}; -$site_state: {{ $P.siteState }}; -$social_icons_only: {{ $P.socialIcons.iconsOnly }}; -$social_icons_transition: {{ $P.socialIcons.transition }}; -$links_settings_layout: {{ $P.linksSets.layout }}; -$toc_enable: {{ $P.toc.enable }}; -$toc_expand_all: {{ $P.toc.expandAll }}; -$toc_wrap: {{ $P.toc.wrap }}; +$avatar_rotated : {{ $P.avatar.rotated }}; +$avatar_rounded : {{ $P.avatar.rounded }}; +$avatar_rounded : {{ $P.avatar.rounded }}; +$site_state : {{ $P.siteState }}; +$social_icons_only : {{ $P.socialIcons.iconsOnly }}; +$social_icons_transition : {{ $P.socialIcons.transition }}; +$links_settings_layout : {{ $P.linksSets.layout }}; +$toc_enable : {{ $P.toc.enable }}; +$toc_expand_all : {{ $P.toc.expandAll }}; +$toc_wrap : {{ $P.toc.wrap }}; // Posts -$creative_commons_post: {{ $P.creativeCommons.post }}; -$follow_me: {{ isset $P "followme" }}; -$motion_trans_coll_header: {{ $P.motion.transition.collHeader }}; -$motion_trans_post_block: {{ $P.motion.transition.postBlock }}; -$motion_trans_post_body: {{ $P.motion.transition.postBody }}; -$motion_trans_post_header: {{ $P.motion.transition.postHeader }}; -$post_edit_enable: {{ $P.postEdit.enable }}; -$post_meta_item_text: {{ $P.postMeta.itemText }}; -$reward_settings_animation: {{ $P.rewardSets.animation }}; -$post_end_tag_icon: {{ $P.postFooter.tagIcon }}; +$creative_commons_post : {{ $P.creativeCommons.post }}; +$follow_me : {{ isset $P "followme" }}; +$motion_trans_coll_header : {{ $P.motion.transition.collHeader }}; +$motion_trans_post_block : {{ $P.motion.transition.postBlock }}; +$motion_trans_post_body : {{ $P.motion.transition.postBody }}; +$motion_trans_post_header : {{ $P.motion.transition.postHeader }}; +$post_edit_enable : {{ $P.postEdit.enable }}; +$post_meta_item_text : {{ $P.postMeta.itemText }}; +$reward_settings_animation : {{ $P.rewardSets.animation }}; +$post_end_tag_icon : {{ $P.postFooter.tagIcon }}; // TODO find the paramters -$text_align_desktop: justify; -$text_align_mobile: justify; +$text_align_desktop : {{ $P.textAlign.desktop }}; +$text_align_mobile : {{ $P.textAlign.mobile }}; // Note -$note_icons: {{ $P.note.icons }}; -$note_light_bg_offset: {{ $P.note.lightBgOffset }}; -$note_style: {{ $P.note.style }}; +$note_icons : {{ $P.note.icons }}; +$note_light_bg_offset : {{ $P.note.lightBgOffset }}; +$note_style : {{ $P.note.style }}; // Tabs -$tabs_transition_labels: {{ $P.tabs.transition.labels }}; -$tabs_transition_tabs: {{ $P.tabs.transition.tabs }}; +$tabs_transition_labels : {{ $P.tabs.transition.labels }}; +$tabs_transition_tabs : {{ $P.tabs.transition.tabs }}; // Reading progress bar -$reading_progress_start: {{ $P.readingProgress.start }}; -$reading_progress_color: {{ $P.readingProgress.color }}; -$reading_progress_enable: {{ $P.readingProgress.enable }}; -$reading_progress_height: {{ $P.readingProgress.height }}; -$reading_progress_position: {{ $P.readingProgress.position }}; -$reading_progress_reversed: {{ $P.readingProgress.reversed }}; +$reading_progress_start : {{ $P.readingProgress.start }}; +$reading_progress_color : {{ $P.readingProgress.color }}; +$reading_progress_enable : {{ $P.readingProgress.enable }}; +$reading_progress_height : {{ $P.readingProgress.height }}; +$reading_progress_position : {{ $P.readingProgress.position }}; +$reading_progress_reversed : {{ $P.readingProgress.reversed }}; // Thirdparty -$math_mathjax_enable: {{ $P.math.mathjax.enable }}; -$related_posts_enable: {{ $P.relatedPosts.enable }}; -$pdf_enable: {{ $P.pdf.enable }}; -$pdf_height: {{ $P.pdf.height }}; +$math_mathjax_enable : {{ $P.math.mathjax.enable }}; +// TODO +//$related_posts_enable : {{ $P.relatedPosts.enable }}; +$related_posts_enable : false; +$pdf_enable : {{ $P.pdf.enable }}; +$pdf_height : {{ $P.pdf.height }}; // Search engine -$algolia_search_enable: {{ $P.algoliaSearch.enable }}; -$local_search_enable: {{ $P.localSearch.enable }}; +$algolia_search_enable : {{ $P.algoliaSearch.enable }}; +$local_search_enable : {{ $P.localSearch.enable }}; // Online IM -$gitalk_enable: {{ $P.gitalk.enable }}; -$gitter_enable: {{ $P.gitter.enable }}; +//$gitalk_enable : {{ $P.gitalk.enable }}; +$gitalk_enable : false; +$gitter_enable : {{ $P.gitter.enable }}; // Comment -$disqusjs_enable: {{ $P.disqusjs.enable }}; -$livere_enable: {{ $P.livere.enable }}; -$utterances_enable: {{ $P.utterances.enable }}; -$waline_enable: {{ $P.waline.enable }}; +//$disqusjs_enable : {{ $P.disqusjs.enable }}; +$disqusjs_enable : false; +$livere_enable : {{ isset $P.livere "uid" }}; +$utterances_enable : {{ isset $P.utterances "utterances" }}; +$waline_enable : {{ isset $P.waline "serverurl" }}; {{- with .Site.Params.comments }} -{{ $tce := and (isset . "nav") (and .storage (gt (len .nav) 1)) }} -$two_comments_enable: {{ $tce }}; +{{- $tce := and (isset . "nav") (and .storage (gt (len .nav) 1)) }} +$two_comments_enable : {{ $tce }}; {{- if $tce }} -{{- $sortNav := sort .nav "weight" }} -$two_comments_actived: {{ .active }}; -$first_comment_color: {{ (index $sortNav 0).color }}; -$first_comment_name: {{ lower (index $sortNav 0).name }}; -$second_comment_color: {{ (index $sortNav 1).color }}; -$second_comment_name: {{ lower (index $sortNav 1).name }}; +{{- $sortNav := sort .nav "weight" }} +$two_comments_actived : {{ .active }}; +$first_comment_color : {{ (index $sortNav 0).color }}; +$first_comment_name : {{ lower (index $sortNav 0).name }}; +$second_comment_color : {{ (index $sortNav 1).color }}; +$second_comment_name : {{ lower (index $sortNav 1).name }}; {{- end }} {{- end }} diff --git a/assets/js/config.js b/assets/js/config.js index caa0075..cde3ea8 100644 --- a/assets/js/config.js +++ b/assets/js/config.js @@ -1,66 +1,51 @@ if (!window.NexT) window.NexT = {}; (function() { - const className = 'next-config'; - const staticConfig = {}; - let variableConfig = {}; - - const parse = text => JSON.parse(text || '{}'); - - const update = name => { - const targetEle = document.querySelector(`.${className}[data-name="${name}"]`); - if (!targetEle) return; - const parsedConfig = parse(targetEle.text); - if (name === 'main') { - Object.assign(staticConfig, parsedConfig); - } else { - variableConfig[name] = parsedConfig; + const siteConfig = { + "hostname" : "{{ .Site.BaseURL }}", + "root" : "/", + "images" : "{{ .Site.Params.images }}", + "scheme" : "{{ .Site.Params.scheme }}", + "darkmode" : {{ .Site.Params.darkmode }}, + "version" : "{{ .Site.Data.config.version }}", + "sidebar" : {{ .Site.Params.sidebar | jsonify }}, + "copybtn" : {{ .Site.Params.codeblock.copyBtn }}, + "bookmark" : {{ .Site.Params.bookmark | jsonify }}, + "comments" : {{ .Site.Params.comments | jsonify }}, + "lazyload" : {{ .Site.Params.lazyload }}, + "pangu" : {{ .Site.Params.pangu }}, + "stickytabs" : {{ .Site.Params.tabs.sticky }}, + "motion" : {{ .Site.Params.motion | jsonify }}, + // TODO Find prismjs + //"prism" : "", + "i18n" : { + "placeholder" : "", + "empty" : "${query}", + "hits_time" : "'${hits}', '${time}'", + "hits" : "${hits}" + }, + {{- if .Site.Params.algoliaSearch.enable }} + // TODO + "algolia" : { + "appID" : "", + "apiKey" : "", + "indexName" : "", + "hits" : "" } + {{- end }} + {{- if .Site.Params.localSearch.enable }} + // TODO + "path" : "/search.json", + "localsearch": {{ .Site.Params.localSearch | jsonify }}, + {{- end }} + "lang" : "{{ .Site.LanguageCode }}", + "permalink" : "{{ .Page.Permalink | absURL }}", + "title" : "{{ .Page.Title }}", + "isHome" : {{ .IsHome }}, + "isPage" : {{ .IsPage }} }; + + window.CONFIG = new Proxy(siteConfig, {}); - update('main'); - - window.CONFIG = new Proxy({}, { - get(overrideConfig, name) { - let existing; - if (name in staticConfig) { - existing = staticConfig[name]; - } else { - if (!(name in variableConfig)) update(name); - existing = variableConfig[name]; - } - - // For unset override and mixable existing - if (!(name in overrideConfig) && typeof existing === 'object') { - // Get ready to mix. - overrideConfig[name] = {}; - } - - if (name in overrideConfig) { - const override = overrideConfig[name]; - - // When mixable - if (typeof override === 'object' && typeof existing === 'object') { - // Mix, proxy changes to the override. - return new Proxy({ ...existing, ...override }, { - set(target, prop, value) { - target[prop] = value; - override[prop] = value; - return true; - } - }); - } - - return override; - } - - // Only when not mixable and override hasn't been set. - return existing; - } - }); - - document.addEventListener('pjax:success', () => { - variableConfig = {}; - }); -})(); +})(); \ No newline at end of file diff --git a/assets/js/motion.js b/assets/js/motion.js index 2f38249..f98867e 100644 --- a/assets/js/motion.js +++ b/assets/js/motion.js @@ -82,7 +82,7 @@ NexT.motion.middleWares = { postList: function() { const sequence = []; - const { post_block, post_header, post_body, coll_header } = CONFIG.motion.transition; + const { postblock, postheader, postbody, collheader } = CONFIG.motion.transition; function animate(animation, selector) { if (!animation) return; @@ -95,10 +95,10 @@ NexT.motion.middleWares = { }); } - animate(post_block, '.post-block, .pagination, .comments'); - animate(coll_header, '.collection-header'); - animate(post_header, '.post-header'); - animate(post_body, '.post-body'); + animate(postblock, '.post-block, .pagination, .post-comments'); + animate(collheader, '.collection-header'); + animate(postheader, '.post-header'); + animate(postbody, '.post-body'); return sequence; }, diff --git a/assets/js/next-boot.js b/assets/js/next-boot.js index dedb54b..66bb821 100644 --- a/assets/js/next-boot.js +++ b/assets/js/next-boot.js @@ -37,20 +37,22 @@ NexT.boot.refresh = function() { * Register JS handlers by condition option. * Need to add config option in Front-End at 'scripts/helpers/next-config.js' file. */ - CONFIG.prism && window.Prism.highlightAll(); + //CONFIG.prism && window.Prism.highlightAll(); /*CONFIG.mediumzoom && window.mediumZoom('.post-body :not(a) > img, .post-body > img', { background: 'var(--content-bg-color)' });*/ CONFIG.lazyload && window.lozad('.post-body img').observe(); CONFIG.pangu && window.pangu.spacingPage(); - CONFIG.exturl && NexT.utils.registerExtURL(); - NexT.utils.registerCopyCode(); + CONFIG.isPage && NexT.utils.replacePostCRLink(); + CONFIG.isPage && CONFIG.copybtn && NexT.utils.registerCopyCode(); NexT.utils.registerTabsTag(); /*NexT.utils.registerActiveMenuItem(); NexT.utils.registerLangSelect();*/ - NexT.utils.registerSidebarTOC(); - NexT.utils.registerPostReward(); + CONFIG.isPage && NexT.utils.registerSidebarTOC(); + CONFIG.isPage && NexT.utils.registerPostReward(); + CONFIG.isPage && NexT.utils.initCommontesDispaly(); + CONFIG.isPage && NexT.utils.registerCommonSwitch(); NexT.utils.wrapTableWithBox(); NexT.utils.registerVideoIframe(); }; diff --git a/assets/js/utils.js b/assets/js/utils.js index 4b95e07..3baa4de 100644 --- a/assets/js/utils.js +++ b/assets/js/utils.js @@ -23,35 +23,29 @@ HTMLElement.prototype.wrap = function(wrapper) { NexT.utils = { - registerExtURL: function() { - document.querySelectorAll('span.exturl').forEach(element => { - const link = document.createElement('a'); - // https://stackoverflow.com/questions/30106476/using-javascripts-atob-to-decode-base64-doesnt-properly-decode-utf-8-strings - link.href = decodeURIComponent(atob(element.dataset.url).split('').map(c => { - return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2); - }).join('')); - link.rel = 'noopener external nofollow noreferrer'; - link.target = '_blank'; - link.className = element.className; - link.title = element.title; - link.innerHTML = element.innerHTML; - element.parentNode.replaceChild(link, element); - }); + replacePostCRLink: function() { + if (CONFIG.hostname.startsWith('http')) return; + // Try to support mutli domain without base URL sets. + let href = window.location.href; + if (href.indexOf('#')>-1){ + href = href.split('#')[0]; + } + let postLink = document.getElementById('post-cr-link'); + if (!postLink) return; + postLink.text = href; + postLink.href = href; }, /** * One-click copy code support. */ registerCopyCode: function() { - let figure = document.querySelectorAll('figure.highlight'); - if (figure.length === 0) figure = document.querySelectorAll('pre:not(.mermaid)'); + let figure = document.querySelectorAll('.highlight pre'); + if (figure.length === 0 || !CONFIG.copybtn) return; figure.forEach(element => { - element.querySelectorAll('.code .line span').forEach(span => { - span.classList.forEach(name => { - span.classList.replace(name, `hljs-${name}`); - }); - }); - if (!CONFIG.copycode) return; + let cn = element.querySelector('code').className; + // TODO seems hard code need find other ways fixed it. + if (cn == '') return; element.insertAdjacentHTML('beforeend', '
'); const button = element.querySelector('.copy-btn'); button.addEventListener('click', () => { @@ -259,6 +253,31 @@ NexT.utils = { }); }, + initCommontesDispaly: function(){ + const comms = document.querySelectorAll('.comment-wrap > div'); + if (comms.length<=1) return; + comms.forEach(function(item){ + var dis = window.getComputedStyle(item, null).display; + item.style.display = dis; + }); + }, + + registerCommonSwitch: function() { + const button = document.querySelector('.comment-switch .switch-btn'); + if (!button) return; + const comms = document.querySelectorAll('.comment-wrap > div'); + button.addEventListener('click', () => { + button.classList.toggle('move'); + comms.forEach(function(item){ + if (item.style.display === 'none') { + item.style.cssText = "display: block; animation: tabshow .8s"; + } else { + item.style.cssText = "display: none;" + } + }); + }); + }, + activateNavByIndex: function(index) { const target = document.querySelectorAll('.post-toc li a.nav-link')[index]; if (!target || target.classList.contains('active-current')) return; @@ -287,7 +306,7 @@ NexT.utils = { if (window.innerWidth < 992 || CONFIG.scheme === 'Pisces' || CONFIG.scheme === 'Gemini') return; // Expand sidebar on post detail page by default, when post has a toc. const hasTOC = document.querySelector('.post-toc'); - let display = CONFIG.page.sidebar; + let display = CONFIG.sidebar; if (typeof display !== 'boolean') { // There's no definition sidebar in the page front-matter. display = CONFIG.sidebar.display === 'always' || (CONFIG.sidebar.display === 'post' && hasTOC); diff --git a/data/config.yaml b/data/config.yaml new file mode 100644 index 0000000..dbd6bed --- /dev/null +++ b/data/config.yaml @@ -0,0 +1,4 @@ +# Hugo NexT theme's custom config +# + +version: 4.0.0 \ No newline at end of file diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 8e8ed5a..646ca35 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -1,21 +1,39 @@ # =============================================================== -# It's recommended to use Alternate Theme Config to configure NexT -# Modifying this file may result in merge conflict -# See: https://theme-next.js.org/docs/getting-started/configuration +# 根据如下的配置说明完善自己的站点配置，建议另外拷贝进行调整避免冲突 +# Improve your site configuration according to the following +# configuration instructions. It is recommended to make +# additional copies for adjustment to avoid conflicts # =============================================================== +# --------------------------------------------------------------- +# Hugo 引擎的基础配置 +# Basic configure for Hugo engine +# --------------------------------------------------------------- + +# 站点域名，比如： https://hugo-next.eu.org +# Website domain, eg: https://hugo-next.eu.org baseURL: / - +# 站点标题 +# Website title +title: Hugo NexT +# 主题名称 +# Theme name theme: hugo-theme-next -canonifyURLs: true - -paginate: 8 - +# 站点默认的语言和代码 +# Default laguage & code for website +defaultContentLanguage: zh-cn +languageCode: zh-CN +# 是否包含中文，日语，韩文 +# Whether contains Chinese, Japanese and Korean +hasCJKLanguage: true +# 每页显示文章数量 +# Display items per page +paginate: 10 +# 开启支持表情符号 +# Enable Emoji support enableEmoji: true - -relativeurls: true - -# Make markdown content support HTML syntax +# 让 Makedown 文档支持 HTML 语法，高亮，文章目录等功能 +# Make markdown content support HTML syntax, highlight, toc etc. markup: goldmark: renderer: @@ -25,78 +43,50 @@ markup: lineNos: true lineNumbersInTable: true noClasses: true + # 高亮代码的样式名称，可选：monokai | emacs | api | dracula | friendly + # 更多的样式：https://xyproto.github.io/splash/docs/all.html + # Highlight style: monokai | emacs | api | dracula | friendly + # More: https://xyproto.github.io/splash/docs/all.html + style: "monokai" tableOfContents: + # 开始/结束标题级别：1-6 + # Heading title level of start or end: 1-6 + startLevel: 1 endLevel: 3 ordered: false - startLevel: 1 - -defaultContentLanguage: zh-cn -languages: - zh-cn: - title: Hugo NexT - languageName: 中文 - languageCode: zh-CN - hasCJKLanguage: true - weight: 1 - en: - title: Hugo NexT - languageName: English - languageCode: en - hasCJKLanguage: false - weight: 2 - menus: - main: - - identifier: home - name: Home - url: / - pre: home - weight: 1 - - identifier: about - name: About - url: /about.html - pre: user - weight: 2 - - identifier: archives - name: Archives - url: /posts - pre: archive - weight: 3 - - identifier: commonweal - name: Commonweal 404 - url: /404.html - pre: heartbeat - weight: 4 - params: - author: Theme NexT - subtitle: Theme for Hugo - description: Stay easily & powerful. - keywords: Hugo,NexT,Theme,easily,powerful - linksSets: - icon: fa fa-globe - title: Friends - postFooter: - endLineTip: "~ End of this post ~" #-------------------------------------- +# 菜单配置说明 +# identifier ： 唯一标识不可重复 +# name ： 菜单显示名称 +# pageref ： 本站点链接地址，与 URL 选其一 +# url ： 站点外部链接地址，以 http 或者 https 开头 +# pre ： 菜单小图标 +# weight ： 显示顺序，字数越小越靠前 +# # Menus Settings -# Attribute pre is Font Awesome icon name without prefix "fa-". -# External url should start with http:// or https:// . +# identifier : Unique ID cannot be repeated +# name : Menu name +# pageref : Link of webiste and not appeare same time with url +# url : Exteneral link out of website and start with http or https +# pre : Icon of menu +# weight : Order number and smaller is top # ------------------------------------- menus: main: - identifier: home name: 首页 - url: / + pageref: / pre: home weight: 1 - identifier: about name: 关于 - url: /about.html + pageref: /about.html pre: user weight: 2 - identifier: archives name: 归档 - url: /posts + pageref: /posts pre: archive weight: 3 - identifier: commonweal @@ -105,86 +95,73 @@ menus: pre: heartbeat weight: 4 +#----------------------------------------- +# Hugo NexT 主题参数配置 +# Configure Settings for Hugo NexT theme +#----------------------------------------- params: + # 需要显示文章的部分，即content目录下的文件夹名称 + # Sections for show in home & archive page + # and it's forlder name which under content mainSections: ["posts"] + # 年，月，日及时间的格式化样式 + # Format style for year,month,date & time yearFormat: "2006" monthFormat: "01-02" dateFormat: "2006-01-02" timeFormat: "2006-01-02T15:04:05-07:00" - # --------------------------------------------------------------- - # Theme Core Configuration Settings - # See: https://theme-next.js.org/docs/theme-settings/ - # --------------------------------------------------------------- - - # Allow to cache content generation. - #cache: - # enable: true - - # Remove unnecessary files after hexo generate. - # minify: false - - # Define custom file paths. - # Create your custom files in site directory `source/_data` and uncomment needed files below. - customFilePath: - #head: source/_data/head.njk - #header: source/_data/header.njk - #sidebar: source/_data/sidebar.njk - #postMeta: source/_data/post-meta.njk - #postBodyEnd: source/_data/post-body-end.njk - #footer: source/_data/footer.njk - #bodyEnd: source/_data/body-end.njk - #variable: source/_data/variables.styl - #mixin: source/_data/mixins.styl - #style: source/_data/styles.styl - - - # --------------------------------------------------------------- - # Scheme Settings - # --------------------------------------------------------------- + # 页面模式 # Schemes #scheme: Muse #scheme: Mist #scheme: Pisces scheme: Gemini + # 开启暗模式 # Dark Mode darkmode: true - # --------------------------------------------------------------- + # 站点基本信息 # Site Information Settings - # --------------------------------------------------------------- author: NexT 主题 subtitle: 为 Hugo 打造的主题 description: 保持简单的易用性和强大的功能。 keywords: Hugo,NexT,主题,简单,强大 + # 不同尺寸站点图标 + # Different size of favicon favicon: icon: /imgs/icons/favicon.ico small: /imgs/icons/favicon_16x16_next.png medium: /imgs/icons/favicon_32_32_next.png appleTouchIcon: /imgs/icons/apple_touch_icon_next.png - #android_manifest: /manifest.json + # 自定义 Logo （目前只支持 Mist 页面模式） # Custom Logo (Warning: Do not support scheme Mist) customLogo: #/imgs/hugo_next_logo.png + # 知识共享国际许可 4.0 + # 更多信息： https://creativecommons.org/about/cclicenses/ # Creative Commons 4.0 International License. # See: https://creativecommons.org/about/cclicenses/ creativeCommons: + # 可选配置： by | by-nc | by-nc-nd | by-nc-sa | by-nd | by-sa | cc-zero # Available values: by | by-nc | by-nc-nd | by-nc-sa | by-nd | by-sa | cc-zero license: by-nc-sa + # 可选配置： big | small # Available values: big | small size: big + # 侧边栏显示 + # Show in sidebar sidebar: true + # 文章底部显示 + # Show in post footer post: true - # You can set a language value if you prefer a translated version of CC license, e.g. deed.zh - # CC licenses are available in 39 languages, you can find the specific and correct abbreviation you need on https://creativecommons.org - # language: + # OG SEO 配置 # Open graph settings - # See: https://hexo.io/docs/helpers#open-graph openGraph: enable: true #twitter: @@ -196,46 +173,38 @@ params: # admins: # app_id: - - # --------------------------------------------------------------- - # Menu Settings - # --------------------------------------------------------------- - - # Usage: `Key: /link/ || icon` - # Key is the name of menu item. If the translation for this item is available, the translated text will be loaded, otherwise the Key name will be used. Key is case-sensitive. - # Value before `||` delimiter is the target link, value after `||` delimiter is the name of Font Awesome icon. - # External url should start with http:// or https:// - #menu: - #home: / || fa fa-home - #about: /about/ || fa fa-user - #tags: /tags/ || fa fa-tags - #categories: /categories/ || fa fa-th - #archives: /archives/ || fa fa-archive - #schedule: /schedule/ || fa fa-calendar - #sitemap: /sitemap.xml || fa fa-sitemap - #commonweal: /404/ || fa fa-heartbeat - - # Enable / Disable menu icons / item badges. + # 开启菜单的图标及动画效果，数字徽章显示 + # Enable / Disable menu icons & animation / item badges. menuSets: icons: true + transition: true badges: true # --------------------------------------------------------------- + # 侧边栏设置 # Sidebar Settings - # See: https://theme-next.js.org/docs/theme-settings/sidebar # --------------------------------------------------------------- - sidebar: - # Sidebar Position. + # 侧边栏位置，可选： left | right + # Sidebar Position: left | right position: left - #position: right + # 自定义侧边栏的宽度，默认配置如下 + # Muse | Mist: 320 + # Pisces | Gemini: 240 + # # Manual define the sidebar width. If commented, will be default for: # Muse | Mist: 320 # Pisces | Gemini: 240 width: 256 + # 侧边栏的显示方式，可选值： + # - post 默认在文章页面展开显示 + # - always 在所有页面展开显示 + # - hide 点击侧边栏按钮才显示 + # - remove 完全不显示侧边栏 + # # Sidebar Display (only for Muse | Mist), available values: # - post expand on posts automatically. Default. # - always expand for all pages automatically. @@ -243,36 +212,38 @@ params: # - remove totally remove sidebar including sidebar toggle. display: post + # 侧边栏内部填充像素大小 # Sidebar padding in pixels. padding: 18 + # 侧边栏与顶部菜单栏的偏移像素大小（仅作用于 Pisces | Gemini 页面模式） # Sidebar offset from top menubar in pixels (only for Pisces | Gemini). offset: 12 + # 侧边栏头像 # Sidebar Avatar avatar: + # 设置显示头像的相对路径 # Replace the default image and set the url here. url: /imgs/hugo_next_avatar.png + # 开启头像的圆形显示效果 # If true, the avatar will be displayed in circle. rounded: true + # 开启头像随鼠标转动动画 # If true, the avatar will be rotated with the cursor. rotated: true + # 是否在侧边栏显示文章、分类、标签信息 # Posts / Categories / Tags in sidebar. siteState: true + # 社交链接地址 + # 用法： `Key: 名称 || 链接地址 || 图标` + # Key 用于排序建议从0开始 # Social Links - # Usage: `Key: permalink || icon` - # Key is the link label showing to end users. + # Usage: `Key: name || permalink || icon` + # Key is the link label order. # Value before `||` delimiter is the target permalink, value after `||` delimiter is the name of Font Awesome icon. socials: - # - name: GitHub - # icon: fab fa-github - # url: https://github.com/yourname - # weight: 1 - # - name: 微博 - # icon: fab fa-weibo - # url: https://weibo.com/yourname - # weight: 2 social0: Github || https://github.com/elkan1788 || fab fa-github #social1: E-Mail || mailto:yourname@gmail.com || fa fa-envelope social2: 知乎 || https://www.zhihu.com/people/lisenhui || fa fa-book @@ -284,98 +255,146 @@ params: #Instagram: https://instagram.com/yourname || fab fa-instagram #Skype: skype:yourname?call|chat || fab fa-skype + # 社交链接图标设置 + # Social icon setting socialIcons: + # 是否支持图标显示 + # Enable icon display enable: true + # 只显示图标 + # Only show icon iconsOnly: false + # 开启动画效果 + # Enable animation transition: true - # Blog rolls + # 友情链接设置 + # Friend links setting linksSets: + # Fontawsome图标名称 + # Icon name in Font Awesome + # See: https://fontawesome.com/ icon: fa fa-globe + # 显示标题 + # Show title title: 友情链接 + # 可选值： block | inline # Available values: block | inline layout: inline + # 友情链接地址 + # 用法： `Key: 显示名称 || 链接地址` + # Links of your friends + # Usage: `Key: name || permalink` links: link0: Hugo-NexT || https://gitee.com/hugo-next/hugo-theme-next link1: 凡梦星尘空间站 || https://lisenhui.cn + # 文章目录显示 # Table of Contents in the Sidebar # Front-matter variable (nonsupport wrap expand_all). toc: enable: true + # 自动设置列表的数字 # Automatically add list number to toc. number: true - # If true, all words will placed on next lines if header width longer then sidebar width. + # 开启自动换行显示 + # If true, all words will placed on next lines + # if header width longer then sidebar width. wrap: false - # If true, all level of TOC in a post will be displayed, rather than the activated part of it. + # 自动展开子列表 + # If true, all level of TOC in a post will be displayed, + # rather than the activated part of it. expandAll: false + # 最大的列表深度，建议不要超过3层 # Maximum heading depth of generated toc. - maxDepth: 6 + maxDepth: 3 # --------------------------------------------------------------- + # 站点底部设置 # Footer Settings - # See: https://theme-next.js.org/docs/theme-settings/footer # --------------------------------------------------------------- - - # Show multilingual switcher in footer. - language_switcher: false - footer: - # Specify the year when the site was setup. If not defined, current year will be used. + # 站点开始年份，默认为当下时间的年份 + # Specify the year when the site was setup. + # If not defined, current year will be used. since: 2010 + # 年份和版权信息之间的图标 # Icon between year and copyright info. icon: - # Icon name in Font Awesome. See: https://fontawesome.com/icons + # 图标名称 + # Icon name in Font Awesome. name: fa fa-heart + # 开启图标动画效果 # If you want to animate the icon, set it to true. animated: true + # 使用16进制设置图标的颜色 # Change the color of icon, using Hex Code. color: "#ff0000" - # If not defined, `author` from Hexo `_config.yml` will be used. + # 版权信息，如不设置将会使用 `author` 变量 + # If not defined, `author` from site information will be used. copyright: - # Powered by Hexo & NexT + # 显示 Hugo 和 NexT 支持 + # Powered by Hugo & NexT powered: true - # Beian ICP and gongan information for Chinese users. See: https://beian.miit.gov.cn, http://www.beian.gov.cn + # 国内 ICP 备案和公安网备信息 + # Beian ICP and gongan information for Chinese users. + # See: https://beian.miit.gov.cn, http://www.beian.gov.cn beian: enable: true + # ICP 备案的具体信息 icp: 粤ICP备 18047355-1 号 - # The digit in the num of gongan beian. + # 公安网备的省份简称 provinceAbbr: 沪 - # The full num of gongan beian. + # 公安网备案号 gonganNum: 31011402009770 - # The icon for gongan beian. See: http://www.beian.gov.cn/portal/download - #gongan_icon_url: + + # 站点支持供应商列表 + # Vendors list who support website. vendors: + enable: true + # 支持说明 + # Some support information description. title: 提供CDN/云资源支持 + # 供应商列表，请将带有图标的供应商放在前面 + # Vendors list, remember that who with logo image need put in top. list: - - name: CloudBase Webify - link: https://webify.cloudbase.net - name: Vercel - img: /imgs/vendors/vercel.svg || 55 + image: + url: /imgs/vendors/vercel.svg + width: 50 link: https://vercel.com - name: 又拍云 - img: /imgs/vendors/upyun.png || 50 + image: + url: /imgs/vendors/upyun.png + width: 43 link: https://upyun.com + - name: Webify + link: https://webify.cloudbase.net # --------------------------------------------------------------- + # 文章参数设置 # Post Settings - # See: https://theme-next.js.org/docs/theme-settings/posts # --------------------------------------------------------------- - # Automatically excerpt description in homepage as preamble text. - excerpt_description: true + # TODO + # 将文章的描述内容用于首页展示（暂时未实现） + # Automatically excerpt description in homepage + # as preamble text (not implemented by now). + excerptDesc: true + # 是否显示阅读更多按钮 # Read more button # If true, the read more button will be displayed in excerpt section. readMoreBtn: true + # 开启文章头部元素显示 # Post meta display settings postMeta: itemText: true @@ -387,167 +406,163 @@ params: wordCount: true readTime: true - # Post wordcount display settings - # Dependencies: https://github.com/next-theme/hexo-word-counter - # symbols_count_time: - # separated_meta: true - # item_text_total: false + # 文章底部的设置 + # Post footer settings postFooter: + # 通过线条将文章和捐赠等信息隔开，并在线条上添加提示信息 + # Use line to separate post and reward etc other information + # and add tip title on line. endLineTip: "~ 我可是有底线的哟 ~" + # 是否使用小图标，默认使用 # 符号表示标签 + # Use icon instead of the symbol # to indicate the tag tagIcon: true - # Use icon instead of the symbol # to indicate the tag at the bottom of the post - tag_icon: false - - # Donate (Sponsor) settings - # Front-matter variable (nonsupport animation). + # 捐赠信息设置 + # Donate (Sponsor) settings. rewardSets: - # If true, a donate button will be displayed in every article by default. + # 是否开启捐赠按钮，开启后将在每个文章页面底部显示 + # If true, a donate button will be displayed + # in every article by default. enable: true + # 是否开启捐赠方式的动画效果 + # If true, the donate type title will with animation. animation: true + # 捐赠信息的描述，支持 HTML 语法 + # Comment for donate and suppport HTML syntax comment: '请我喝杯咖啡吧 ヾ(^▽^*)))' + # 捐赠方式 + # 用例： `名称:图像地址` + # Donate type + # Usage: `name:image url` + reward: + wechatpay: /imgs/wechat-pay.png + alipay: /imgs/ali-pay.png + #paypal: /images/paypal.png + #bitcoin: /images/bitcoin.png - reward: - wechatpay: /imgs/wechat-pay.png - alipay: /imgs/ali-pay.png - #paypal: /images/paypal.png - #bitcoin: /images/bitcoin.png - + # 提供其它订阅站点文章的方式 + # 用例： `key: 名称 || 链接（图像地址）|| icon名称` # Subscribe through Telegram Channel, Twitter, etc. - # Usage: `Key: permalink || icon` (Font Awesome) + # Usage: `Key: name || permalink || icon` (Font Awesome) followMe: #channel0: Twitter || https://twitter.com/username || fab fa-twitter #channel1: Telegram || https://t.me/channel_name || fab fa-telegram channel2: WeChat || /images/wechat_channel.jpg || fab fa-weixin channel3: RSS || /atom.xml || fa fa-rss - # Related popular posts - # Dependencies: https://github.com/sergeyzwezdin/hexo-related-posts - relatedPosts: - enable: false - title: # Custom header, leave empty to use the default one - display_in_home: false - + # 文章的在线编辑 # Post edit # Easily browse and edit blog source code online. postEdit: enable: true - url: https://github.com/user-name/repo-name/tree/branch-name/subdirectory-name/ # Link for view source - #url: https://github.com/user-name/repo-name/edit/branch-name/subdirectory-name/ # Link for fork & edit - - # Show previous post and next post in post footer if exists - # Available values: left | right | false - postNavigation: left + url: https://github.com/user-name/repo-name/tree/branch-name/subdirectory-name/ - # --------------------------------------------------------------- - # Custom Page Settings - # See: https://theme-next.js.org/docs/theme-settings/custom-pages - # --------------------------------------------------------------- - - # TagCloud settings for tags page. - tagcloud: - min: 12 # Minimum font size in px - max: 30 # Maximum font size in px - amount: 200 # Total amount of tags - orderby: name # Order of tags - order: 1 # Sort order - - # Google Calendar - # Share your recent schedule to others via calendar page. - calendar: - calendar_id: # Your Google account E-Mail - api_key: - orderBy: startTime - showLocation: false - offsetMax: 72 # Time Range - offsetMin: 4 # Time Range - showDeleted: false - singleEvents: true - maxResults: 250 - - - # --------------------------------------------------------------- - # Misc Theme Settings - # See: https://theme-next.js.org/docs/theme-settings/miscellaneous - # --------------------------------------------------------------- - - # Preconnect CDN for fonts and plugins. - # For more information: https://www.w3.org/TR/resource-hints/#preconnect - preconnect: false - + # 设置文本的对齐方式 # Set the text alignment in posts / pages. textAlign: + # 可选值： start | end | left | right | center | justify | justify-all | match-parent # Available values: start | end | left | right | center | justify | justify-all | match-parent desktop: justify mobile: justify + # 在手机端显示减少填充和边距 # Reduce padding / margin indents on devices with narrow width. - mobileLayoutEconomy: false + mobileLayoutEconomy: true + # 顶部面板在不同模式下的颜色 # Browser header panel color. themeColor: light: "#222" dark: "#222" + # TODO 暂时不支持 # Override browsers' default behavior. bodyScrollbar: # Place the scrollbar over the content. overlay: false # Present the scrollbar even if the content is not overflowing. - stable: false + stable: true - codeblock: - # Code Highlight theme - # All available themes: https://theme-next.js.org/highlight/ - theme: - light: default - dark: stackoverflow-dark - prism: - light: prism - dark: prism-dark + # 代码块的设置 + # Codeblock settings + codeblock: + # 支持样式类型： default | flat | mac + # Available values: default | flat | mac + style: mac + # 在代码块上添加拷贝按钮 # Add copy button on codeblock - copyBtn: - enable: false - # Available values: default | flat | mac - style: default + copyBtn: true + # 返回顶部设置 + # Backtop settings backTop: + # 开启返回顶部按钮显示 + # If true, will display backtop button in buttom. enable: true + # 在侧边栏显示返回顶部按钮 # Back to top in sidebar. sidebar: false + # 在返回按钮上显示进度 # Scroll percent label in b2t button. - scrollpercent: false + scrollpercent: true + # 读取进度条设置 # Reading progress bar readingProgress: + # 是否显示读取进度条 + # If true, will display the read progress bar. enable: true + # 进度条开始位置： left | right # Available values: left | right start: left + # 进度条显示位置： top | bottom # Available values: top | bottom - position: bottom + position: top + # 是否反向显示进度 + # If true, the read progress will be reversed. reversed: false + # 用16进制设置进度条颜色 + # Change the color of progress bar, using Hex Code. color: "#37c6c0" + # 进度条的高度 + # Hight of the read progress bar. height: 3px + # 书签功能 # Bookmark Support bookmark: + # 开启书签功能 + # If true, will display bookmark in all page. enable: true + # 自定义书签显示颜色 # Customize the color of the bookmark. color: "#222" + # 支持方式： auto | manual + # auto: 当关闭页面或点击书签按钮时，会自动保存当前的阅读进度 + # manual: 只有当点击书签按钮时才会保存阅读进度 # If auto, save the reading progress when closing the page or clicking the bookmark-icon. # If manual, only save it by clicking the bookmark-icon. - save: auto + save: manual + # 右上角在 Github 上面关注我的横幅 # `Follow me on GitHub` banner in the top-right corner. githubBanner: + # 是否开启显示 + # If true, will display banner. enable: true + # 你的 Github 仓库地址 + # Your repository url on Github. permalink: https://github.com/yourname + # 关注说明 + # Show this title when cursor move on. title: Follow me on GitHub # --------------------------------------------------------------- - # Font Settings + # TODO + # 字体设置（暂时未实现） + # Font Settings (not implemented by now) # --------------------------------------------------------------- # Find fonts on Google Fonts (https://fonts.google.com) # All fonts set here will have the following styles: @@ -559,7 +574,7 @@ params: # --------------------------------------------------------------- font: - enable: false + enable: true # Uri of fonts host, e.g. https://fonts.googleapis.com (Default). host: @@ -599,43 +614,46 @@ params: # --------------------------------------------------------------- + # SEO 设置 # SEO Settings - # See: https://theme-next.js.org/docs/theme-settings/seo # --------------------------------------------------------------- - # If true, site-subtitle will be added to index page. - # Remember to set up your site-subtitle in Hexo `_config.yml` (e.g. subtitle: Subtitle) - index_with_subtitle: false - - # Automatically add external URL with Base64 encrypt & decrypt. - exturl: false - # If true, an icon will be attached to each external URL - exturl_icon: true + # 给所有外部链接添加新标签打开 + # Automatically add `target='_blank'` attribute in external URL. + exturl: + enable: true + # 给所有外部链接加上图标 + # If true, an icon will be attached to each external URL + icon: true + # 谷歌站点验证 # Google Webmaster tools verification. # See: https://developers.google.com/search - googleSiteVerification: 5AUIVYTbHIAuz-eQtxSfZbWW5eg9_EVZMSQycIuXrG0 + googleSiteVerification: # + # 微软 Bing 站验证 # Bing Webmaster tools verification. # See: https://www.bing.com/webmasters - bingSiteVerification: + bingSiteVerification: # + # Yandex 站点验证 # Yandex Webmaster tools verification. # See: https://webmaster.yandex.ru - yandexSiteVerification: + yandexSiteVerification: # + # 百度站点验证 # Baidu Webmaster tools verification. # See: https://ziyuan.baidu.com/site - baiduSiteVerification: + baiduSiteVerification: # # --------------------------------------------------------------- + # 第三方插件和服务设置 # Third Party Plugins & Services Settings - # See: https://theme-next.js.org/docs/third-party-services/ - # More plugins: https://github.com/next-theme/awesome-next - # You may need to install the corresponding dependency packages # --------------------------------------------------------------- + # TODO + # 数学公式渲染支持（暂时未实现） # Math Formulas Render Support # Warning: Please install / uninstall the relevant renderer according to the documentation. # See: https://theme-next.js.org/docs/third-party-services/math-equations @@ -656,28 +674,24 @@ params: # See: https://github.com/KaTeX/KaTeX/tree/master/contrib/copy-tex copy_tex: false - # Easily enable fast Ajax navigation on your website. - # For more information: https://github.com/next-theme/pjax - pjax: false - - # FancyBox is a tool that offers a nice and elegant way to add zooming functionality for images. + # TODO + # FancyBox is a tool that offers a nice and elegant way + # to add zooming functionality for images. # For more information: https://fancyapps.com/fancybox/ fancybox: false - # A JavaScript library for zooming images like Medium. - # Warning: Do not enable both `fancybox` and `mediumzoom`. - # For more information: https://medium-zoom.francoischalifour.com - mediumzoom: false - + # TODO # Vanilla JavaScript plugin for lazyloading images. # For more information: https://apoorv.pro/lozad.js/demo/ lazyload: false + # TODO # Pangu Support # For more information: https://github.com/vinta/pangu.js # Server-side plugin: https://github.com/next-theme/hexo-pangu pangu: false + # TODO # Quicklink Support # For more information: https://getquick.link # Front-matter variable (nonsupport home archive). @@ -698,112 +712,123 @@ params: # --------------------------------------------------------------- + # 评论功能设置 # Comments Settings - # See: https://theme-next.js.org/docs/third-party-services/comments # --------------------------------------------------------------- + # 评论组件设置，最多支持2个显示 # Multiple Comment System Support comments: - enable: true - # Available values: tabs | buttons - #style: tabs + # 开启评论组件 + # If true, will show comment component in post end. + enable: true + # 设置默认使用的评论插件 + # 可选值：livere | waline | utterances | artalk | giscus # Choose a comment system to be displayed by default. - # Available values: disqus | disqusjs | changyan | livere | gitalk | utterances - active: waline - # Setting `true` means remembering the comment system selected by the visitor. + # Available values: livere | waline | utterances | artalk | giscus + active: giscus + # 让用户自己选择使用评论插件留言 + # 如果设置为 false，将采用 active 参数的那个插件 + # Setting `true` means remembering the comment system selected by + # the visitor, otherwise use the `active` setting comment system. storage: true + # TODO # Lazyload all comment systems. - #lazyload: false + # lazyload: false + # 设置你要显示的2个评论插件，`weight` 数字越小越靠前 + # `name` 参数名可选值：livere | waline | utterances | artalk | giscus # Modify texts or order for any naves, here are some examples. nav: - - name: Waline + - name: waline title: Waline color: "#27ae60" - weight: 1 - - name: Utterances - title: Utters - color: "#494949" weight: 2 + - name: giscus + title: Giscus + color: "#886ce4" + weight: 1 + # Waline 评论插件 + # 更多配置信息请参考：https://waline.js.org/ + # Waline comments system + # More info seee: https://waline.js.org/ waline: - enable: true placeholder: "请文明发言" emoji: false imgUploader: false wordLimit: 200 requiredMeta: ['nick', 'mail'] - serverURL: "https://waline.js.org" - - # Disqus - # For more information: https://disqus.com - disqus: - enable: false - shortname: - count: true - - # DisqusJS - # For more information: https://disqusjs.skk.moe - disqusjs: - enable: false - # API Endpoint of Disqus API (https://disqus.com/api/docs/). - # Leave api empty if you are able to connect to Disqus API. Otherwise you need a reverse proxy for it. - # For example: - # api: https://disqus.skk.moe/disqus/ - api: - apikey: # Register new application from https://disqus.com/api/applications/ - shortname: # See: https://disqus.com/admin/settings/general/ - - # Changyan - # For more information: https://changyan.kuaizhan.com - changyan: - enable: false - appid: - appkey: + serverURL: # + # Artalk 评论插件 + # 更多配置信息请参考：https://artalk.js.org + # Artalk comments system + # More info see: https://artalk.js.org + artalk: + site: "默认站点" + placeholder: "请文明发言，谢谢！" + server: # + + # Artalk 评论插件 + # 更多配置信息请参考： # LiveRe comments system - # You can get your uid from https://livere.com/insight/myCode (General web site) + # You can get your uid from https://livere.com/ livere: - enable: true - uid: MTAyMC81MTM4MC8yNzg2MQ== # + uid: # - # Gitalk - # For more information: https://gitalk.github.io - gitalk: - enable: false - github_id: # GitHub repo owner - repo: # Repository name to store issues - client_id: # GitHub Application Client ID - client_secret: # GitHub Application Client Secret - admin_user: # GitHub repo owner and collaborators, only these guys can initialize gitHub issues - distraction_free_mode: true # Facebook-like distraction free mode - # When the official proxy is not available, you can change it to your own proxy address - proxy: https://cors-anywhere.azm.workers.dev/https://github.com/login/oauth/access_token # This is official proxy address - # Gitalk's display language depends on user's browser or system environment - # If you want everyone visiting your site to see a uniform language, you can set a force language value - # Available values: en | es-ES | fr | ru | zh-CN | zh-TW - language: - - # Utterances + # Utterances 评论插件 + # 更多配置信息请参考：https://utteranc.es + # Utterances comments system # For more information: https://utteranc.es utterances: - enable: true - repo: username/repo-name # Github repository owner and name + # Github 仓库地址，格式：用户名/仓库名称 + # Github repository owner and name + repo: username/repo-name + # 问题标题的模式，可选值：pathname | url | title | og:title # Available values: pathname | url | title | og:title issueTerm: pathname - label: Comments + # 问题的标签分类 + # Label flag for Github issues + label: comments + # 主题可选值： github-light | github-dark | preferred-color-scheme | github-dark-orange | icy-dark | dark-blue | photon-dark | boxy-light # Available values: github-light | github-dark | preferred-color-scheme | github-dark-orange | icy-dark | dark-blue | photon-dark | boxy-light - theme: github-light + theme: preferred-color-scheme - # Isso - # For more information: https://posativ.org/isso/ - isso: # + # Giscus 评论插件 + # 更多配置信息请参考：https://giscus.app + # Giscus comments system + # For more information: https://giscus.app + giscus: + # Github 仓库地址，格式：用户名/仓库名称 + # Github repository owner and name + repo: username/repo_name + # Giscus 生成的仓库 Id + # Generate repository Id from Giscus + repoId: # + # 讨论区的分类名称 + # Github discussions category + category: Announcements + # 讨论区分类 ID + # Generate category Id from Giscus + categoryId: # + # 讨论区帖子标题，可选值： pathname | url | title | og:title | 自定义 + # Available values: pathname | url | title | og:title | custom + mapping: title + # 评论输入框的位置，可选值： top | bottom + # Aavilable value: top | bottom + inputPosition: top + # 主题可选值： light | light_high_contrast | light_protanopia | light_tritanopia | dark | dark_high_contrast | dark_protanopia | dark_tritanopia | dark_dimmed | transparent_dark | preferred_color_scheme + # Available values: light | light_high_contrast | light_protanopia | light_tritanopia | dark | dark_high_contrast | dark_protanopia | dark_tritanopia | dark_dimmed | transparent_dark | preferred_color_scheme + theme: preferred_color_scheme # --------------------------------------------------------------- + # 文章小组件和分享服务设置 # Post Widgets & Content Sharing Services - # See: https://theme-next.js.org/docs/third-party-services/post-widgets # --------------------------------------------------------------- + # TODO + # 文章评级功能（暂未支持） # Star rating support to each article. # To get your ID visit https://widgetpack.com rating: @@ -811,66 +836,26 @@ params: id: # color: "#fc6423" - # AddThis Share. See: https://www.addthis.com - # Go to https://www.addthis.com/dashboard to customize your tools. - addThisId: + # AddThis文章分享功能 + # 更多信息及配置请参考：https://www.addthis.com + # AddThis Share. + # See: https://www.addthis.com + addThisId: # # --------------------------------------------------------------- + # 站点统计功能 # Statistics and Analytics - # See: https://theme-next.js.org/docs/third-party-services/statistics-and-analytics # --------------------------------------------------------------- - # 51La Analytics - # See: https://invite.51.la/1NUfGTS1?target=V6 - laId: # - - # Google Analytics - # See: https://analytics.google.com - google_analytics: - tracking_id: # - # By default, NexT will load an external gtag.js script on your site. - # If you only need the pageview feature, set the following option to true to get a better performance. - only_pageview: false - - # Baidu Analytics - # See: https://tongji.baidu.com - baidu_analytics: # - - # Growingio Analytics - # See: https://www.growingio.com - growingio_analytics: # - - # Cloudflare Web Analytics - # See: https://www.cloudflare.com/web-analytics/ - cloudflare_analytics: - - # Microsoft Clarity Analytics - # See: https://clarity.microsoft.com/ - clarity_analytics: # - - # Show number of visitors of each article. - # You can visit https://www.leancloud.cn to get AppID and AppKey. - leancloudVisitors: - enable: false - appId: # - appKey: # - # Required for apps from CN region - serverUrl: # - # Dependencies: https://github.com/theme-next/hexo-leancloud-counter-security - # If you don't care about security in leancloud counter and just want to use it directly - # (without hexo-leancloud-counter-security plugin), set `security` to `false`. - security: true - - # Another tool to show number of visitors to each article. - # Visit https://console.firebase.google.com/u/0/ to get apiKey and projectId. - # Visit https://firebase.google.com/docs/firestore/ to get more information about firestore. - firestore: - enable: false - collection: articles # Required, a string collection name to access firestore database - apiKey: # Required - projectId: # Required + analytics: + # 51La 站点统计 + # 更多信息请参考：https://invite.51.la/1NUfGTS1?target=V6 + # 51La Analytics + # See: https://invite.51.la/1NUfGTS1?target=V6 + laId: # + # TODO # Show Views / Visitors of the website / page with busuanzi. # For more information: http://ibruce.info/2015/04/04/busuanzi/ busuanzi: @@ -884,8 +869,9 @@ params: # --------------------------------------------------------------- + # TODO + # 内容搜索服务（暂时未实现） # Search Services - # See: https://theme-next.js.org/docs/third-party-services/search-services # --------------------------------------------------------------- # Algolia Search @@ -893,10 +879,9 @@ params: algoliaSearch: enable: false hits: - per_page: 10 + perPage: 10 # Local Search - # Dependencies: https://github.com/next-theme/hexo-generator-searchdb localSearch: enable: true # If auto, trigger search by changing input. @@ -911,8 +896,8 @@ params: # --------------------------------------------------------------- + # 在线聊天服务 # Chat Services - # See: https://theme-next.js.org/docs/third-party-services/chat-services # --------------------------------------------------------------- # A button to open designated chat widget in sidebar. @@ -922,22 +907,6 @@ params: icon: fa fa-comment # Icon name in Font Awesome, set false to disable icon. text: Chat # Button text, change it as you wish. - # Chatra Support - # For more information: https://chatra.com - # Dashboard: https://app.chatra.io/settings/general - chatra: - enable: false - async: true - id: # Visit Dashboard to get your ChatraID - #embed: # Unfinished experimental feature for developers. See: https://chatra.com/help/api/#injectto - - # Tidio Support - # For more information: https://www.tidio.com - # Dashboard: https://www.tidio.com/panel/dashboard - tidio: - enable: false - key: # Public Key, get it from dashboard. See: https://www.tidio.com/panel/settings/developer - # Gitter Support # For more information: https://gitter.im gitter: @@ -946,8 +915,9 @@ params: # --------------------------------------------------------------- + # TODO + # 标签设置（暂时未实现） # Tags Settings - # See: https://theme-next.js.org/docs/tag-plugins/ # --------------------------------------------------------------- # Note tag (bootstrap callout) @@ -990,23 +960,27 @@ params: # --------------------------------------------------------------- + # 动画效果设置 # Animation Settings # --------------------------------------------------------------- + # 通过 Animate.css 实现对整站的动画效果 # Use Animate.css to animate everything. # For more information: https://animate.style motion: enable: false - async: false + async: true transition: # All available transition variants: https://theme-next.js.org/animate/ postBlock: fadeIn postHeader: fadeInDown postBody: fadeInDown collHeader: fadeInLeft + # 侧边样效果 只有在 Pisces | Gemini 模式下才支持 # Only for Pisces | Gemini. sidebar: fadeInUp + # TODO # Progress bar in the top during page loading. # For more information: https://github.com/CodeByZach/pace pace: @@ -1019,9 +993,10 @@ params: # corner-indicator | fill-left | flat-top | flash | loading-bar | mac-osx | material | minimal theme: minimal + # TODO # Canvas ribbon # For more information: https://github.com/hustcc/ribbon.js - canvas_ribbon: + canvasRibbon: enable: false size: 300 # The width of the ribbon alpha: 0.6 # The transparency of the ribbon @@ -1029,30 +1004,30 @@ params: # --------------------------------------------------------------- + # CDN 服务（暂时只支持 unpkg 和 cndjs） # CDN Settings - # See: https://theme-next.js.org/docs/advanced-settings/vendors # --------------------------------------------------------------- vendors: # The CDN provider of NexT internal scripts. - # Available values: local | jsdelivr | unpkg | cdnjs | custom + # Available values: local | unpkg | cdnjs | custom # Warning: If you are using the latest master branch of NexT, please set `internal: local` internal: local # The default CDN provider of third-party plugins. - # Available values: local | jsdelivr | unpkg | cdnjs | custom + # Available values: local | unpkg | cdnjs | custom # Dependencies for `plugins: local`: https://github.com/next-theme/plugins plugins: unpkg + # TODO # Custom CDN URL # For example: # custom_cdn_url: https://cdn.jsdelivr.net/npm/${npm_name}@${version}/${minified} # custom_cdn_url: https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${cdnjs_file} - custom_cdn_url: + #custom_cdn_url: + # TODO # Assets # Accelerate delivery of static files using a CDN # The js option is only valid when vendors.internal is local. css: css js: js - images: imgs - - + images: imgs \ No newline at end of file diff --git a/exampleSite/content/about.en.md b/exampleSite/content/about.en.md deleted file mode 100644 index a9ae199..0000000 --- a/exampleSite/content/about.en.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: "About Hugo NexT Origination" -description: "" - -date: 2022-06-09T20:12:52+08:00 -lastmod: 2022-06-09T20:12:52+08:00 - -share: false -followme: false -nav: false -copyright: false -url: about.html ---- - -`Hugo NexT` organization is formed by many friends from all over the world who love the theme and style of `NexT`, so that this theme can continue to be carried forward in the `Hugo` engine. Welcome to join us! - -# Our vision - -Keep the classic black-and-white collocation of `NexT` & keep easily and powerful features. \ No newline at end of file diff --git a/exampleSite/content/posts/emoji-support.md b/exampleSite/content/posts/emoji-support.md index bbf8a14..b0ab583 100644 --- a/exampleSite/content/posts/emoji-support.md +++ b/exampleSite/content/posts/emoji-support.md @@ -13,7 +13,7 @@ tags: - emoji toc: false -url: "emoji-support.html" +url: "post/emoji-support.html" --- Emoji 可以通过多种方式在 Hugo 项目中启用。 diff --git a/exampleSite/content/posts/hello-world.en.md b/exampleSite/content/posts/hello-world.en.md deleted file mode 100644 index dc49e61..0000000 --- a/exampleSite/content/posts/hello-world.en.md +++ /dev/null @@ -1,58 +0,0 @@ ---- -title: "Hello World" -description: "Descript some skill for Hugo build site." - -lastmod: 2022-06-03T16:43:23+08:00 -date: 2022-06-02T11:52:03+08:00 - -categories: - - Blog -tags: - - Hugo - - Startup - -url: hello-world.html -weight: 2 ---- - -> "Use keyword which is `weight` make post sticky to top." - -[Hugo](https://gohugo.io/) is one of the most popular open-source static site generators. With its amazing speed and flexibility, Hugo makes building websites fun again. - - - -## Quick Start - -### New Post - -```shell -$ hugo new hello-world.md -``` - -More info: [Front formats](https://gohugo.io/content-management/formats/) - -### Server - -```shell -$ hugo server -``` - -More info: [Hugo Server](https://gohugo.io/commands/hugo_server/) - -### Build - -```shell -$ hugo -``` - -More Info: [Hugo Build](https://gohugo.io/commands/hugo/) - -### Deploy - -```shell -$ hugo deploy -``` - -More Info：[Hugo Deployment](https://gohugo.io/commands/hugo_deploy/) - -Enjoy your Hugo journey & good luck for you! \ No newline at end of file diff --git a/exampleSite/content/posts/hello-world.md b/exampleSite/content/posts/hello-world.md index 2abc8de..a7fdcff 100644 --- a/exampleSite/content/posts/hello-world.md +++ b/exampleSite/content/posts/hello-world.md @@ -11,7 +11,7 @@ tags: - Hugo - 开始 -url: hello-world.html +url: post/hello-world.html weight: 2 --- diff --git a/exampleSite/content/posts/markdown-syntax.md b/exampleSite/content/posts/markdown-syntax.md index ef223bd..89bf77e 100644 --- a/exampleSite/content/posts/markdown-syntax.md +++ b/exampleSite/content/posts/markdown-syntax.md @@ -17,7 +17,7 @@ tags: toc: false draft: false -url: markdown-syntax.html +url: post/markdown-syntax.html --- 仅以此篇文章来测试下在 `NexT` 主题中在通过 `Hugo` 引擎来建站时，是否支持 `Markdown` 文件内容中所写的各种语法，并展示下实际的效果。 diff --git a/exampleSite/content/posts/syntax-highlighting.md b/exampleSite/content/posts/syntax-highlighting.md index db5ccb6..bbedc6f 100644 --- a/exampleSite/content/posts/syntax-highlighting.md +++ b/exampleSite/content/posts/syntax-highlighting.md @@ -13,7 +13,7 @@ tags: - 高亮 - Chroma -url: "syntax-highlighting.html" +url: post/syntax-highlighting.html --- Hugo 通过 Chroma 提供非常快速的语法高亮显示，现 Hugo 中使用 Chroma 作为代码块高亮支持，它内置在 Go 语言当中，速度是真的非常、非常快，而且最为重要的是它也兼容之前我们使用的 Pygments 方式。 diff --git a/exampleSite/content/posts/table-of-content.md b/exampleSite/content/posts/table-of-content.md index 4d48a92..884653c 100644 --- a/exampleSite/content/posts/table-of-content.md +++ b/exampleSite/content/posts/table-of-content.md @@ -14,7 +14,7 @@ tags: - 博客 toc: true -url: "table-of-content.html" +url: post/table-of-content.html --- 巴顿将军说过：“衡量一个人是否成功，不是看他站到顶峰，而是从顶峰跌落之后的反弹力”，褚时健的人生便是如此，中年发家致富，名利双收，之后又跌落到谷底，等到74岁再创业，10年后带着褚橙归来，东山再起收获亿万财富，他的发展轨迹就是反弹的过程。 diff --git a/exampleSite/start.sh b/exampleSite/start.sh index 165aa03..b4e8e82 100644 --- a/exampleSite/start.sh +++ b/exampleSite/start.sh @@ -1,5 +1,6 @@ #!/bin/bash -# +# 本地快速启动脚本 +# Quick start in local. next() { cat << EOT @@ -11,12 +12,12 @@ next() { ██║ ╚████║███████╗██╔╝ ██╗ ██║ ╚═╝ ╚═══╝╚══════╝╚═╝ ╚═╝ ╚═╝ ======================================== -NexT version $1 -Documentation: https://hugo-next.js.org +Hugo NexT version $1 +Documentation: https://hugo-next.eu.org ======================================== EOT } -next V0.0.1 +next `cat ../VERSION` hugo server -D -t ../.. --port 1414 --panicOnWarning \ No newline at end of file diff --git a/i18n/en.yaml b/i18n/en.yaml index 4fef79f..a719c45 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -1,20 +1,20 @@ #-------------------------------------- # English Version #-------------------------------------- -Posts: +posts: other: Posts -Tag: +tag: other: Tag -Tags: +tags: other: Tags TagTitle: other: Tag Collection -Category: +category: other: Category -Categories: +categories: other: Categories CateTitle: - other: Classify Management + other: Classification Items AllSome: other: "All {{ .Some }}" diff --git a/i18n/zh-cn.yaml b/i18n/zh-cn.yaml index eec90dc..049d65e 100644 --- a/i18n/zh-cn.yaml +++ b/i18n/zh-cn.yaml @@ -2,20 +2,20 @@ # 中文版本 #-------------------------------------- -Posts: +posts: other: 文章 -Tag: +tag: other: 标签 -Tags: +tags: other: 标签 TagTitle: other: 标签集锦 -Category: +category: other: 分类 -Categories: +categories: other: 分类 CateTitle: - other: 分类管理 + other: 分类栏目 AllSome: other: "所有 {{ .Some }}" diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html new file mode 100644 index 0000000..e4603f8 --- /dev/null +++ b/layouts/_default/_markup/render-link.html @@ -0,0 +1,7 @@ +{{- $extURL := and .Page.Site.Params.exturl.enable (strings.HasPrefix .Destination "http") }} + + {{ .Text | safeHTML }} + {{- if and $extURL .Page.Site.Params.exturl.icon }} + + {{- end }} + \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index eb99ade..184cd56 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,22 +1,8 @@ -{{- .Scratch.Set "postsCount" (len (where .Page.Site.RegularPages "Section" "in" .Site.Params.mainSections)) -}} -{{- .Scratch.Set "catsCount" (len .Site.Taxonomies.categories) -}} -{{- .Scratch.Set "tagsCount" (len .Site.Taxonomies.tags) -}} -{{- $vendors := .Site.Data.resources.vendors -}} -{{- $pluginVen := .Site.Params.vendors.plugins -}} -{{- $pluginCDN := index $vendors $pluginVen -}} -{{- .Scratch.Set "pluginCDN" $pluginCDN -}} +{{- partial "init.html" . -}} - - - {{ hugo.Generator }} - - - - - {{- partial "head.html" . }} {{ block "title" . }}{{ .Site.Title }}{{ end }}