Skip to content

Commit 8372db7

Browse files
authored
Merge pull request #362 from dillonzq/develop
2 parents 9f58106 + 8ef1edd commit 8372db7

File tree

66 files changed

+305
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+305
-146
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ I hope you will LoveIt ❤️!
110110
* **Bilibili player** shortcode
111111
* Kinds of **admonitions** shortcode
112112
* **Custom style** shortcode
113+
* **Custom script** shortcode
113114
* **Animated typing** supported by [TypeIt](https://typeitjs.com/)
114115
* **Dynamic scroll** supported by [Smooth Scroll](https://github.com/cferdinandi/smooth-scroll)
115116
* **Cookie consent banner** supported by [cookieconsent](https://github.com/osano/cookieconsent)

README.zh-cn.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
* 支持 **Bilibili 视频** shortcode
106106
* 支持多种**注释**的 shortcode
107107
* 支持**自定义样式**的 shortcode
108+
* 支持**自定义脚本**的 shortcode
108109
* 支持基于 [TypeIt](https://typeitjs.com/)**打字动画** shortcode
109110
* 支持基于 [Smooth Scroll](https://github.com/cferdinandi/smooth-scroll)**滚动动画**
110111
* 支持基于 [cookieconsent](https://github.com/osano/cookieconsent)**Cookie 许可横幅**
File renamed without changes.

assets/css/_override.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// ==============================
2+
// Override Variables
3+
// 覆盖变量
4+
// ==============================

assets/css/_variables.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Variables
33
// ==============================
44

5+
@import url('https://fonts.googleapis.com/css2?family=Nunito:wght@800&display=swap');
6+
57
// ========== Global ========== //
68
// Font and Line Height
79
$global-font-family: system-ui, -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft YaHei UI, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif !default;
@@ -57,7 +59,7 @@ $header-background-color: #f8f8f8 !default;
5759
$header-background-color-dark: #252627 !default;
5860

5961
// Font style of the header title
60-
$header-title-font-family: $global-font-family !default;
62+
$header-title-font-family: Nunito, $global-font-family !default;
6163
$header-title-font-size: 1.5rem !default;
6264

6365
// Color of the hover header item
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
@charset "utf-8";
22

33
@import "_variables";
4-
5-
{{- if fileExists "config/css/_override.scss" -}}
6-
@import "_override";
7-
{{- end -}}
4+
@import "_override";
85

96
@import "_mixin/index";
107

@@ -19,6 +16,4 @@
1916

2017
@import "_core/media";
2118

22-
{{- if fileExists "config/css/_custom.scss" -}}
23-
@import "_custom";
24-
{{- end -}}
19+
@import "_custom";

assets/lib/polyfill.yml renamed to assets/data/polyfill.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
theme:
2+
- html5shiv
3+
- Object.values
4+
- Promise
5+
- fetch
6+
- Element.prototype.after
17
smooth-scroll:
28
- Element.prototype.closest
39
- requestAnimationFrame
@@ -14,8 +20,3 @@ TypeIt:
1420
- Math.sign
1521
- Object.assign
1622
- Promise
17-
theme:
18-
- Object.values
19-
- Promise
20-
- fetch
21-
- Element.prototype.after

assets/js/theme.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/theme.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exampleSite/assets/css/_custom.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// ==============================
2+
// Custom style
3+
// 自定义样式
4+
// ==============================

0 commit comments

Comments
 (0)