Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from hugo-fixit:master #22

Merged
merged 46 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
91b5838
:bug: Fix: fix custom-assets block postion
Lruihao Jun 28, 2024
052d128
:bug: Fix: fix code title overflow in code header
Lruihao Jun 30, 2024
cf91f23
:memo: Docs: update default hugo.toml
Lruihao Jul 4, 2024
44d0c76
:recycle: Refactor: deprecate .Sites.First in favor of .Sites.Default
Lruihao Jul 4, 2024
061a3e3
:recycle: Refactor: deprecate .Site.IsMultiLingual in favor of hugo.I…
Lruihao Jul 4, 2024
4f56a40
:bug: Fix: fix code block scrollbar color error
Lruihao Jul 4, 2024
c18aac4
:bug: Fix: fix admontion overflow error
Lruihao Jul 4, 2024
b067289
:bug: Fix: fix footnote style error
Lruihao Jul 4, 2024
c021a53
:memo: Docs: update embed archetypes
Lruihao Jul 7, 2024
adf2acd
:lipstick: Style: update bilibili and douyin shortcode style
Lruihao Jul 7, 2024
906f346
:pencil: Docs: fix typo in translations
Lruihao Jul 9, 2024
3dcb3b1
:memo: Docs: update hugo.toml
Lruihao Jul 9, 2024
e39d789
:recycle: Refactor: refactor breadcrumb translations with .Translatio…
Lruihao Jul 9, 2024
45c71ef
:bug: Fix: .hiddenFormRss not taking effect
Lruihao Jul 10, 2024
6d9c6f5
:bulb: Feat: use the original title after archiving the articles
Lruihao Jul 10, 2024
2b2bde7
:bug: Fix: collection nav and list can not show in posts that have pa…
Lruihao Jul 11, 2024
f9a09e4
:sparkles: Feat: add submenu param divided and change submenu border …
Lruihao Jul 11, 2024
2605111
:speech_balloon: Docs: update Hugo Fixit demo site
Lruihao Jul 12, 2024
dc279b4
:bug: Fix: fix code block scrollbar color error
Lruihao Jul 12, 2024
632243e
:bug: Style: fix Gist code highlight error in dark mod
Lruihao Jul 14, 2024
419ade9
:sparkles: Feat: add data-open attribute for code block
Lruihao Jul 16, 2024
df7c7b9
Chore(ignore): update ISSUE_TEMPLATE and README
Lruihao Jul 16, 2024
b3b0e6a
:pencil2: Feat: update Markdown code block type
Lruihao Jul 18, 2024
9bacfa9
:tada: Feat: add timeline support for code blocks
Lruihao Jul 20, 2024
f6911c4
:sparkles: Feat: add open and center params for details shortcode
Lruihao Jul 20, 2024
42f811d
:bug: Fix(ignore): timeline background color invaild in dark mod
Lruihao Jul 20, 2024
ee4441c
:tada: Feat: add extended shortcode - Timeline support
Lruihao Jul 21, 2024
ec1deba
:bug: Fix: the content of the code block in the details shortcode can…
Lruihao Jul 21, 2024
07c40db
:memo: Docs(ignore): update README
Lruihao Jul 21, 2024
9925af0
Chore(ignore): remove FUNDING.yml
Lruihao Jul 21, 2024
2a53dba
:sparkles: Feat: add echarts support for code blocks
Lruihao Jul 21, 2024
f44d89a
:recycle: Refactor: mermaid shortcode and codeblock render
Lruihao Jul 21, 2024
44b63ca
:lipstick: Style: add title for friends avatar
Lruihao Jul 21, 2024
3e2484e
:wrench: Chore(ignore): change giscus default comment order
Lruihao Jul 22, 2024
03e9b11
:zap: Feat(igonre): Timeline feature enhancement
Lruihao Jul 22, 2024
affaea7
:bug: Fix: password runecount calc error
Lruihao Jul 22, 2024
9d32ba9
:memo: Docs: update hugo.toml
Lruihao Jul 23, 2024
9894d99
:lipstick: Style: update timeline animation
Lruihao Jul 23, 2024
7c83677
:pencil2: Docs: fix typo
Lruihao Jul 23, 2024
537ad1d
:sparkles: Feat: add config whether to enable the code wrapper
Lruihao Jul 24, 2024
de18e91
:sparkles: Feat: add param to hide single code block header (#462)
Lruihao Jul 24, 2024
99dc099
:pencil: Docs(ignore): rename function initHighlight to initCodeWrapper
Lruihao Jul 24, 2024
dd33cab
:bug: Fix: take a dirty hack to fix the bug of APlayer and smoothScroll
Lruihao Jul 24, 2024
bcd6987
:bug: Fix(ignore): TypeError: Cannot read properties of null (reading…
Lruihao Jul 24, 2024
6cbb898
:bug: Fix: fix cookieconsent init error
Lruihao Jul 24, 2024
25e358d
:bookmark: Chore(release): 0.3.9
Lruihao Jul 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/FUNDING.yml

This file was deleted.

8 changes: 2 additions & 6 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
blank_issues_enabled: false
blank_issues_enabled: true
contact_links:
- name: Questions 问题讨论
url: https://github.com/hugo-fixit/FixIt/discussions/new
about: Please ask questions in Discussion. 请在讨论中提问。

- name: 官方 QQ 群
url: https://qm.qq.com/cgi-bin/qm/qr?k=awbwdTtSQ_-H5QGzeJxdWgv6JMbNehNM&jump_from=webapi
about: '加入 FixIt 主题交流群: 814031017'

- name: Theme Documentation 主题文档
url: https://fixit.lruihao.cn/categories/documentation/
url: https://fixit.lruihao.cn/documentation/
about: Please read the documentation carefully. 请先仔细阅读主题文档。
29 changes: 21 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# FixIt Theme | Hugo

[![GitHub release (latest by date)](https://img.shields.io/github/v/release/hugo-fixit/FixIt?style=flat)](https://github.com/hugo-fixit/FixIt/releases)
[![Hugo](https://img.shields.io/badge/Hugo-%5E0.123.0-ff4088?style=flat&logo=hugo)](https://gohugo.io/)
[![Hugo](https://img.shields.io/badge/Hugo-%5E0.127.0-ff4088?style=flat&logo=hugo)](https://gohugo.io/)
[![License](https://img.shields.io/github/license/hugo-fixit/FixIt?style=flat)](/LICENSE)

👉 English README | [简体中文说明](README.zh-cn.md)
Expand Down Expand Up @@ -86,8 +86,9 @@ To see this theme in action, here are some [live demo sites](https://fixit.lruih
- Extended Markdown syntax for **ruby annotation**
- Extended Markdown syntax for **fraction**
- **Mathematical formula** supported by [KaTeX](https://katex.org/)
- **Diagrams** shortcode supported by [mermaid](https://github.com/knsv/mermaid)
- **Interactive data visualization** shortcode supported by [ECharts](https://echarts.apache.org/)
- **Diagrams** code fences extended and shortcode supported by [mermaid](https://github.com/knsv/mermaid)
- **Interactive data visualization** shortcode and code fences extended supported by [ECharts](https://echarts.apache.org/)
- **Timeline** code fences extended and shortcode supported
- **Mapbox** shortcode supported by [Mapbox GL JS](https://docs.mapbox.com/mapbox-gl-js)
- **Music player** shortcode supported by [APlayer](https://github.com/MoePlayer/APlayer) and [MetingJS](https://github.com/metowolf/MetingJS)
- **Bilibili player** and **Douyin player** shortcode
Expand Down Expand Up @@ -128,14 +129,26 @@ FixIt supports the following languages:

[Languages Compatibility](https://fixit.lruihao.cn/documentation/basics/#language-compatibility)

## [Roadmap](https://github.com/hugo-fixit/FixIt/projects/1)
## Community

## Questions, ideas, bugs, pull requests
All feedback is welcome! Head over to the [discussions][discussions], [Pull requests][pulls] and [issues][issues] tracker.

All feedback is welcome! Head over to the [issues](https://github.com/hugo-fixit/FixIt/issues) or [discussions](https://github.com/hugo-fixit/FixIt/discussions) tracker.
| Community | Description |
| :------------------------- | :------------------------------- |
| [Discussions][discussions] | Official GitHub discussion forum |
| [FixIt QQ group][qq-group] | Official QQ group: `814031017` |
| [Hugo FixIt Planet][zsxq] | Official Knowledge Planet |

[discussions]: https://github.com/hugo-fixit/FixIt/discussions
[pulls]: https://github.com/hugo-fixit/FixIt/pulls
[issues]: https://github.com/hugo-fixit/FixIt/issues
[qq-group]: https://qm.qq.com/cgi-bin/qm/qr?k=awbwdTtSQ_-H5QGzeJxdWgv6JMbNehNM&jump_from=webapi
[zsxq]: https://t.zsxq.com/oZYCt

## Contributing

- [Roadmap of FixIt](https://github.com/orgs/hugo-fixit/projects/2)

Please see [CONTRIBUTING.md](CONTRIBUTING.md) for getting started with the contribution.

Make sure that you follow [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) while contributing and engaging in the discussions.
Expand Down Expand Up @@ -208,9 +221,9 @@ Follow [Lruihao](https://github.com/Lruihao "Follow me on GitHub")

If you enjoy the theme, please consider buying me a coffee ☕️. Thanks!

- [PayPal](https://paypal.me/Lruihao)
- [Alipay](images/alipay.jpg)
- [Wechat](images/wechatpay.jpg)
- [Alipay](images/alipay.jpg)
- [PayPal](https://paypal.me/Lruihao)

Don't forget to leave a ⭐️ if you like this theme, thanks!

Expand Down
29 changes: 21 additions & 8 deletions README.zh-cn.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# FixIt 主题 | Hugo

[![GitHub release (latest by date)](https://img.shields.io/github/v/release/hugo-fixit/FixIt?style=flat)](https://github.com/hugo-fixit/FixIt/releases)
[![Hugo](https://img.shields.io/badge/Hugo-%5E0.123.0-ff4088?style=flat&logo=hugo)](https://gohugo.io/)
[![Hugo](https://img.shields.io/badge/Hugo-%5E0.127.0-ff4088?style=flat&logo=hugo)](https://gohugo.io/)
[![License](https://img.shields.io/github/license/hugo-fixit/FixIt?style=flat)](/LICENSE)

👉 [English README](README.md) | 简体中文说明
Expand Down Expand Up @@ -86,8 +86,9 @@
- 支持**上标注释**的扩展 Markdown 语法
- 支持**分数**的扩展 Markdown 语法
- 支持基于 [KaTeX](https://katex.org/) 的**数学公式**
- 支持基于 [mermaid](https://github.com/knsv/mermaid) 的**图表** shortcode
- 支持基于 [ECharts](https://echarts.apache.org/) 的**交互式数据可视化** shortcode
- 支持基于 [mermaid](https://github.com/knsv/mermaid) 的**图表** 代码块扩展语法和 shortcode
- 支持基于 [ECharts](https://echarts.apache.org/) 的**交互式数据可视化** 代码块扩展语法和 shortcode
- 支持 **Timeline** 的代码块扩展语法和 shortcode
- 支持基于 [Mapbox GL JS](https://docs.mapbox.com/mapbox-gl-js) 的 **Mapbox** shortcode
- 支持基于 [APlayer](https://github.com/MoePlayer/APlayer) 和 [MetingJS](https://github.com/metowolf/MetingJS) 的**音乐播放器** shortcode
- 支持 **Bilibili 视频** 和 **抖音视频** shortcode
Expand Down Expand Up @@ -128,14 +129,26 @@ FixIt 支持下列语言:

[语言兼容性](https://fixit.lruihao.cn/zh-cn/theme-documentation-basics/#language-compatibility)

## [路线图](https://github.com/hugo-fixit/FixIt/projects/1)
## 社区支持

## 问题、想法、bugs 和 PRs
所有的反馈都是欢迎的!详见 [Discussions][discussions]、[Pull requests][pulls] 和 [Issues][issues]。

所有的反馈都是欢迎的!详见 [议题](https://github.com/hugo-fixit/FixIt/issues) 或者 [讨论](https://github.com/hugo-fixit/FixIt/discussions) 或者加入 QQ 群:`814031017`。
| 社区 | 说明 |
| :--------------------------- | :---------------------- |
| [Discussions][discussions] | 官方 GitHub 讨论区 |
| [FixIt 主题交流群][qq-group] | 官方 QQ 群:`814031017` |
| [Hugo FixIt 星球][zsxq] | 官方知识星球 |

[discussions]: https://github.com/hugo-fixit/FixIt/discussions
[pulls]: https://github.com/hugo-fixit/FixIt/pulls
[issues]: https://github.com/hugo-fixit/FixIt/issues
[qq-group]: https://qm.qq.com/cgi-bin/qm/qr?k=awbwdTtSQ_-H5QGzeJxdWgv6JMbNehNM&jump_from=webapi
[zsxq]: https://t.zsxq.com/oZYCt

## 参与贡献

- [Hugo FixIt 路线图](https://github.com/orgs/hugo-fixit/projects/2)

请参阅 [CONTRIBUTING.md](CONTRIBUTING.md) 以了解贡献该项目的基本信息。

确保在贡献和参与讨论时遵守 [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md)。
Expand Down Expand Up @@ -212,9 +225,9 @@ Follow [Lruihao](https://github.com/Lruihao "在 GitHub 上关注我")

如果你喜爱这个主题,请考虑给我买杯咖啡 ☕️,谢谢!

- [PayPal](https://paypal.me/Lruihao)
- [支付宝](images/alipay.jpg)
- [微信支付](images/wechatpay.jpg)
- [支付宝](images/alipay.jpg)
- [PayPal](https://paypal.me/Lruihao)

如果你喜欢这个主题,别忘了留下一颗 ⭐️ 哦,谢谢!

Expand Down
23 changes: 16 additions & 7 deletions archetypes/friends.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,35 @@ keywords:
comment: false
---

<!-- When you set data `friends.yml` in `yourProject/data/` directory, it will be automatically loaded here. -->
<!-- The `friends.yml` file placed in the `yourProject/data/` directory will be loaded automatically here. -->

---

<!-- You can define additional content below for this page. -->

## Base info

```yaml
- nickname: Lruihao
avatar: https://lruihao.cn/images/avatar.jpg
url: https://lruihao.cn
description: Lruihao's Note
```
- avatar: https://lruihao.cn/images/avatar.jpg
- url: https://lruihao.cn
- description: Lruihao's Note

## Friendly Reminder

Comment like this:

````markdown
```yaml
- nickname: <your nickname>
avatar: <your avatar>
url: <your site link>
description: <description of your site>
```
````

{{< admonition info "Notice" true >}}

1. If you want to exchange link, please leave a comment in the above format. (personal non-commercial blogs / websites only)
1. If you want to exchange link, please leave a comment as the above format. (personal non-commercial blogs / websites only)
2. :(fa-solid fa-exclamation-triangle): Website failure, stop maintenance and improper content may be unlinked!
3. Those websites that do not respect other people's labor achievements, reprint without source, or malicious acts, please do not come to exchange.

Expand Down
4 changes: 3 additions & 1 deletion archetypes/post-bundle/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ repost:
# See details front matter: https://fixit.lruihao.cn/documentation/content-management/introduction/#front-matter
---

<!--more-->
<!--more-->

<!-- Place resource files in the current article directory and reference them using relative paths, like this: `![alt](images/screenshot.jpg)`. -->
19 changes: 15 additions & 4 deletions assets/css/_core/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,17 @@ header {
margin: 0;
padding: 0;

.menu-item-divider {
list-style: none;
margin: 0.25rem 0.5rem;
height: 1px;
background-color: $menu-border-color;

[data-theme='dark'] & {
background-color: $menu-border-color-dark;
}
}

.menu-item {
list-style: none;

Expand Down Expand Up @@ -262,20 +273,20 @@ header {
display: none;
top: calc(#{$header-height} - 0.75rem);
border-radius: $global-border-radius;
border: 1px solid $global-border-color;
border: 1px solid $menu-border-color;
background-color: $header-background-color;
@include transition(box-shadow 0.3s ease);
@include box-shadow(0 0 1.5rem 0 rgba(0, 0, 0, 0.1));

[data-theme='dark'] & {
background-color: $header-background-color-dark;
border-color: $global-border-color-dark;
border-color: $menu-border-color-dark;
@include box-shadow(0 0 1.5rem 0 rgba(255, 255, 255, 0.1));
}

.menu-item {
height: $header-height*0.5;
line-height: $header-height*0.5;
height: $submenu-height;
line-height: $submenu-height;
max-width: 15rem;
white-space: nowrap;
text-overflow: ellipsis;
Expand Down
2 changes: 1 addition & 1 deletion assets/css/_page/_single.scss
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@
@include link(false, true);
}

sup[id^='fnref:']:has(.footnote-ref) {
sup[id^='fnref']:has(.footnote-ref) {
padding: 2px 4px;
background-color: rgba(238, 238, 238, 0.7);
color: #555555;
Expand Down
6 changes: 3 additions & 3 deletions assets/css/_partials/_maps/_code-type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ $code-type-map: (
"llvm": "LLVM",
"lua": "Lua",
"mako": "Mako",
"md": "markdown",
"mkd": "markdown",
"md": "Markdown",
"mkd": "Markdown",
"mason": "Mason",
"mathematica": "Mathematica",
"mma": "Mathematica",
Expand Down Expand Up @@ -368,6 +368,6 @@ $code-type-map: (
"zed": "Zed",
"zig": "Zig",
// Custom code type
"markdown": "markdown",
"markdown": "Markdown",
"yml": "YAML"
) !default;
33 changes: 21 additions & 12 deletions assets/css/_partials/_single/_code.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ pre:not(.mermaid[data-processed='true']) {
font-family: $code-font-family;

.table-wrapper {
--#{$prefix}scrollbar-thumb-color: initial;
> table,
> table thead,
> table tr,
Expand All @@ -78,6 +79,7 @@ pre:not(.mermaid[data-processed='true']) {
position: relative;

.code-header {
--#{$prefix}bg-code-header: #{darken($code-background-color, 3%)};
display: flex;
justify-content: space-between;
align-items: center;
Expand All @@ -87,13 +89,20 @@ pre:not(.mermaid[data-processed='true']) {
font-weight: bold;
line-height: 1.4em;
color: $code-info-color;
background-color: darken($code-background-color, 3%);
background-color: var(--#{$prefix}bg-code-header);
@include border-radius($global-border-radius);
@include transition(border-radius 0.2s ease);

// delayed loading table-wrapper
& + .table-wrapper {
max-height: 0;
@include border-radius(0 0 $global-border-radius $global-border-radius);
@include details-transition-open;
}

[data-theme='dark'] & {
color: $code-info-color-dark;
background-color: darken($code-background-color-dark, 6%);
--#{$prefix}bg-code-header: #{darken($code-background-color-dark, 3%)};
}

&:hover {
Expand All @@ -119,6 +128,13 @@ pre:not(.mermaid[data-processed='true']) {
position: absolute;
left: 50%;
transform: translateX(-50%);
background-color: var(--#{$prefix}bg-code-header);
padding-inline: 1em;
max-width: 80%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@include z-index(0, 1);
}
}

Expand Down Expand Up @@ -155,10 +171,8 @@ pre:not(.mermaid[data-processed='true']) {

// delayed loading table-wrapper
.table-wrapper {
max-height: 0;
overflow: hidden;
@include border-radius(0 0 $global-border-radius $global-border-radius);
@include details-transition-open;
@include border-radius($global-border-radius);
}

table {
Expand Down Expand Up @@ -217,11 +231,11 @@ pre:not(.mermaid[data-processed='true']) {

&.open {
.code-header {
background-color: darken($code-background-color, 6%);
--#{$prefix}bg-code-header: #{darken($code-background-color, 6%)};
@include border-radius($global-border-radius $global-border-radius 0 0);

[data-theme='dark'] & {
background-color: darken($code-background-color-dark, 3%);
--#{$prefix}bg-code-header: #{darken($code-background-color-dark, 6%)};
}
}

Expand Down Expand Up @@ -348,11 +362,6 @@ pre:not(.mermaid[data-processed='true']) {
}

.table-wrapper {
--#{$prefix}scrollbar-thumb-color: #{$code-background-color};

[data-theme='dark'] & {
--#{$prefix}scrollbar-thumb-color: #{$code-background-color-dark};
}
.highlight {
background-color: $code-background-color;

Expand Down
Loading
Loading