diff --git a/README.md b/README.md index ac189a71..9f43f2b7 100644 --- a/README.md +++ b/README.md @@ -37,14 +37,15 @@ ## 🔥 预览 -| 站点名称 | 站点地址 | -| :---: | :----: | -| 程序员小航 | https://liuzhihang.com | -| 小孙同学 | https://blog.sunguoqi.com | -| 流殃 | https://shyblog.world | -| 羡羡 | https://www.hydsb0.com/ | -| 困困鱼 | https://0206.ink | -| Top John | https://op-lab.top | +| 站点名称 | 站点地址 | +|:--------:|:-------------------------:| +| 程序员小航 | https://liuzhihang.com | +| 小孙同学 | https://blog.sunguoqi.com | +| 流殃 | https://shyblog.world | +| 羡羡 | https://www.hydsb0.com/ | +| 困困鱼 | https://0206.ink | +| Top John | https://op-lab.top | +| Roozen | https://roozen.top | ## 👋 简介 diff --git a/settings.yaml b/settings.yaml index 2a32fe57..7fe598f9 100644 --- a/settings.yaml +++ b/settings.yaml @@ -93,6 +93,15 @@ spec: value: true - label: 隐藏 value: false + - $formkit: repeater + name: typed + label: 打字机显示的文字 + value: [ ] + children: + - $formkit: text + name: text + label: 文字 + placeholder: 请输入文字 - $formkit: attachment name: index_img if: $get(enable_above).value @@ -1152,7 +1161,6 @@ spec: value: "/links" label: 友链链接 - - group: fcircle label: 友链鱼塘 formSchema: @@ -1208,6 +1216,7 @@ spec: value: true - label: 关闭 value: false + - group: todo label: 待办清单 formSchema: @@ -1266,6 +1275,77 @@ spec: - label: 未完成 value: false + - group: equipment + label: 我的装备 + formSchema: + - $formkit: attachment + name: backgroundImg + validation: url + label: 图片 + value: https://liuzhihang.com/upload/moments.png + placeholder: 请输入图片地址 + - $formkit: text + name: smallTitle + label: 小标题 + value: 好物 + - $formkit: text + name: bigTitle + label: 大标题 + value: 实物装备推荐 + - $formkit: text + name: detail + label: 描述 + value: 跟我一起享受科技带来的乐趣 + - $formkit: repeater + name: category_list + label: 我的装备 + value: [ ] + children: + - $formkit: text + name: category_name + label: 装备分类名称 + placeholder: 请输入装备分类名称 + value: 生产力 + - $formkit: text + name: description + label: 分类描述信息 + placeholder: 请输入分类描述信息 + value: 提升自己生产效率的硬件设备 + - $formkit: repeater + name: equipment_list + label: 装备列表 + value: [ ] + children: + - $formkit: attachment + name: img + label: 装备展示图 + placeholder: 请输入装备展示图地址 + - $formkit: text + name: name + label: 装备名称 + placeholder: 请输入装备名称 + value: MacBookPro + - $formkit: text + name: model + label: 装备型号/版本 + placeholder: 请输入装备型号/版本 + value: M1Pro 32G / 1TB + - $formkit: textarea + name: description + label: 装备描述 + placeholder: 请输入装备描述 + value: 屏幕显示效果好、色彩准确、对比度强、性能强劲、续航优秀。可以用来开发和设计。 + - $formkit: text + name: button + label: 左下角按钮显示文字 + placeholder: 请输入左下角按钮显示文字 + value: 详情 + - $formkit: text + name: url + label: 左下角按钮跳转链接 + placeholder: 请输入左下角按钮跳转链接 + value: https://www.apple.com.cn/macbook-pro/ + - group: about label: 关于 formSchema: @@ -2277,10 +2357,10 @@ spec: - $formkit: radio name: bubbleEnable label: 页面卡片顶部气泡升起效果 - help: 已有页面(友链鱼塘,瞬间) + help: 已有页面(友链鱼塘,瞬间,ToDoList,我的装备) value: false options: - label: 启用 value: true - label: 禁用 - value: false + value: false \ No newline at end of file diff --git a/templates/assets/css/fullPage.css b/templates/assets/css/fullPage.css index 75f9e8be..cbe706dd 100644 --- a/templates/assets/css/fullPage.css +++ b/templates/assets/css/fullPage.css @@ -1,8 +1,8 @@ :root { - --light-grey:rgba(255,255,255,0.7); - --white: rgba(255,255,255,0.9); + --light-grey: rgba(255, 255, 255, 0.7); + --white: rgba(255, 255, 255, 0.9); } @media screen and (max-width: 768px) { @@ -14,14 +14,16 @@ } -.back-home-button{ - color: rgba(255,255,255,0.7); +.back-home-button { + color: rgba(255, 255, 255, 0.7); } -#nav #site-name{ + +#nav #site-name { color: var(--light-grey); } -#nav .site-page{ - color: rgba(255,255,255,0.7); + +#nav .site-page { + color: rgba(255, 255, 255, 0.7); } #page-header.full_page { @@ -29,12 +31,14 @@ background-attachment: fixed; border-radius: 0; } + #page-header.full_page #site-info { position: absolute; top: 43%; padding: 0 10px; width: 100%; } + #page-header #scroll-down { position: absolute; bottom: 0; @@ -60,6 +64,7 @@ -webkit-justify-content: center; justify-content: center; } + #page-header #scroll-down .scroll-down-effects { position: relative; width: 100%; @@ -132,4 +137,8 @@ .pl-blur { /* 小图锯齿多，增加高斯模糊 */ filter: blur(50px); +} + +#nav a { + color: var(--light-grey); } \ No newline at end of file diff --git a/templates/bangumis.html b/templates/bangumis.html index 196d948f..de799086 100644 --- a/templates/bangumis.html +++ b/templates/bangumis.html @@ -714,24 +714,11 @@
- + -
- -
-
-
评论
-
隐私政策
-
- 你无需删除空行，直接评论以获取最佳展示效果 -
-
- -
+ th:replace="~{modules/comment :: comment(group = 'content.halo.run', + kind = 'SinglePage', + name = ${singlePage.metadata.name})}"/> diff --git a/templates/equipment.html b/templates/equipment.html new file mode 100644 index 00000000..b265f0c5 --- /dev/null +++ b/templates/equipment.html @@ -0,0 +1,210 @@ + + + + + +
+ + +
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+

[[${category.category_name}]]

+
[[${category.description}]]
+
+ +
+
+ +
+
+
+ [[${equipment.name}]] +
+
[[${equipment.model}]] +
+
+ [[${equipment.description}]] +
+
+ [[${equipment.button}]] + + + +
+
+
+
+
+ +
+ + + +
+ +
+ +
+ + +
+ + + + \ No newline at end of file diff --git a/templates/modules/header/index-img.html b/templates/modules/header/index-img.html index 58a9fe8d..6b3b44e1 100644 --- a/templates/modules/header/index-img.html +++ b/templates/modules/header/index-img.html @@ -3,6 +3,7 @@ +
@@ -11,12 +12,187 @@

[[${site.title}]]

+
+ + +
+ .typed-cursor { + opacity: 1; + } + + .typed-cursor.typed-cursor--blink { + animation: typedjsBlink 0.7s infinite; + -webkit-animation: typedjsBlink 0.7s infinite; + animation: typedjsBlink 0.7s infinite; + } + + @keyframes typedjsBlink { + 50% { + opacity: 0.0; + } + } + + @-webkit-keyframes typedjsBlink { + 0% { + opacity: 1; + } + 50% { + opacity: 0.0; + } + 100% { + opacity: 1; + } + } + + #greetingBox { + position: fixed; + top: 10px; + left: 15%; + width: 400px; + text-align: center; + z-index: 999; + pointer-events: none + } + + #greeting { + display: inline-block; + position: relative; + opacity: 0; + top: -110px; + padding: 5px 40px; + border-radius: 50px; + background-color: #fff; + color: #000; + font-size: small; + transition: .5s; + box-shadow: rgb(0 0 0 / 5%) 0 10px 20px + } + + #greeting.shown { + opacity: 1; + top: 0 + } + + + diff --git a/templates/moments.html b/templates/moments.html index c60cd75b..12869ebe 100644 --- a/templates/moments.html +++ b/templates/moments.html @@ -60,7 +60,7 @@
diff --git a/templates/todolist.html b/templates/todolist.html index 2be69569..0fea49f0 100644 --- a/templates/todolist.html +++ b/templates/todolist.html @@ -25,43 +25,46 @@
- -
- - -
-

[[${todo.class_name}]]

-
    - -
  • - - [[${data.content}]] -
    • -     -
+
+ +
+
+

[[${todo.class_name}]]

+
    + +
  • + + [[${data.content}]] +
    • +     +
+
-
- -
-
-

[[${todo.class_name}]]

-
    - -
  • - - [[${data.content}]] -
    • -     - -
+ +
+
+ +
+
+

[[${todo.class_name}]]

+
    + +
  • + + [[${data.content}]] +
    • +     +
+
-
- + +
+
@@ -79,7 +82,7 @@ display: flex; flex-direction: row; flex-wrap: wrap; - justify-content: center; + justify-content: space-between; margin: 16px 0 10px } @@ -93,13 +96,21 @@ padding: 0 } - #todolist-left { + #todolist-left-container, #todolist-right-container { + display: flex; + flex-direction: column; + justify-content: start; + align-items: center; width: 50%; + } + + #todolist-left { + width: 100%; padding: 0 8px 0 0 } #todolist-right { - width: 50%; + width: 100%; padding: 0 0 0 8px } @@ -113,9 +124,13 @@ } @media screen and (max-width: 768px) { - #todolist-left,#todolist-right { + #todolist-left-container, #todolist-right-container { width: 100%; } + + #todolist-left, #todolist-right { + padding: 0 0 0 0 + } } [data-theme=dark] .todolist-item { @@ -145,7 +160,6 @@ -
diff --git a/theme.yaml b/theme.yaml index 5e2f056f..ef28b551 100644 --- a/theme.yaml +++ b/theme.yaml @@ -37,6 +37,10 @@ spec: description: 追番页面 screenshot: file: bangumis.html + - name: 我的装备页面模版 + description: 我的装备页面 + screenshot: + file: equipment.html description: Halo 2.x Theme base on Thymeleaf, Referring to Butterfly and Heo logo: https://liuzhihang.com/upload/logo.jpg website: https://liuzhihang.com