From 5d323f9d693e67fe99456870e0e63b114f330782 Mon Sep 17 00:00:00 2001 From: Bursteretion <13850801092@163.com> Date: Sat, 29 Feb 2020 19:19:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=8F=AF=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- journals.ftl | 3 +- layout/common/footer.ftl | 115 +++++++++++++++++++----------------- layout/common/widget.ftl | 15 +++-- layout/layout.ftl | 11 +++- layout/widget/profile.ftl | 12 +--- settings.yaml | 121 ++++++++++++++++++++++++++++++++++---- 7 files changed, 197 insertions(+), 82 deletions(-) diff --git a/README.md b/README.md index 1966010..e042e9d 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,4 @@ 1. 克隆或者[下载](https://codeload.github.com/imkundev/halo-theme-fantastic/zip/master)。 2. 压缩为 zip 压缩包之后在后台的主题设置直接上传即可使用。 -3. 用Halo自还的程序拉取 `https://github.com/Bursteretion/halo-theme-fantastic_plus.git` +3. 用Halo自还的程序拉取 `https://github.com/imkundev/halo-theme-fantastic.git` \ No newline at end of file diff --git a/journals.ftl b/journals.ftl index 03a99ac..d8bace3 100644 --- a/journals.ftl +++ b/journals.ftl @@ -1,6 +1,7 @@ <#include "layout/layout.ftl"> <#include "layout/common/article.ftl"> -<@layout title="journals - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}/journals"> +<@layout title="耳语 - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options +.seo_description!}" canonical="${context!}/journals">
<#include "layout/journals/journals.ftl"/>
diff --git a/layout/common/footer.ftl b/layout/common/footer.ftl index c4d6bfa..61baca1 100644 --- a/layout/common/footer.ftl +++ b/layout/common/footer.ftl @@ -2,63 +2,70 @@
-<#-- --> +    <@global.footer /> + <#if settings.busuanzi!true> + +
+ + + + <#if settings.bokejishi!true> +

+ 我的博客已经运行    啦！
+

+ -
- - -

- 我的博客已经运行    啦！
-

- 闽ICP备19016323号 -

- Thanks for Halo   &    -

- - - - - + document.getElementById('clock').innerHTML = runTime; + } + + + <#if settings.social_beian?? && settings.social_beian!=''> +

+ ${settings.social_beian!} +

+ + <#if settings.social_free?? && settings.social_free!=''> + ${settings.social_free!} + + <#if settings.caidai!true> + + + <#if settings.xiantiao!true> + + + <#if settings.dianji!true> + +

diff --git a/layout/common/widget.ftl b/layout/common/widget.ftl index f7f55aa..011dcf7 100644 --- a/layout/common/widget.ftl +++ b/layout/common/widget.ftl @@ -10,6 +10,17 @@ <#if settings.sidebar_profile!true> <#include "../widget/profile.ftl"> + <#if settings.music!true> +
+ + +
+ +
+ <#if settings.sidebar_categories!true> <#include "../widget/category.ftl"> @@ -33,10 +44,6 @@ <#if settings.sidebar_recentcomment!true> <#include "../widget/recent_comments.ftl"> - <#-- <#include "../widget/archive.ftl">--> -<#-- <#if settings.sidebar_tags!true>--> -<#-- <#include "../widget/tag.ftl">--> -<#-- --> <#if position == 'left'>
diff --git a/layout/layout.ftl b/layout/layout.ftl index 7d70781..c2218e8 100644 --- a/layout/layout.ftl +++ b/layout/layout.ftl @@ -51,11 +51,13 @@ padding: 0; vertical-align: unset; } + .tag { font-size: 1em !important; padding-right: 0 !important; padding-left: 0 !important; } + .attr-name { padding-left: 0.75em !important; } @@ -85,7 +87,9 @@ - + <#if settings.kanbanniang!true> + + <@navbar 'page' /> @@ -134,7 +138,10 @@ <@categoryTag method="list"> <#list categories as category> <#if category_index <= 4> -
  • ${category.name}
    • +
  • + ${category.name} +
    • diff --git a/layout/widget/profile.ftl b/layout/widget/profile.ftl index 42994b9..6eb7d48 100644 --- a/layout/widget/profile.ftl +++ b/layout/widget/profile.ftl @@ -14,8 +14,9 @@ box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);">

    ${user.nickname!}

    -
    -

    ${user.description!}

    +
    +

    ${user.description!}

    @@ -112,11 +113,4 @@ box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);">
    - - -
    - - -
    -
    \ No newline at end of file diff --git a/settings.yaml b/settings.yaml index 8b3915e..e82243d 100644 --- a/settings.yaml +++ b/settings.yaml @@ -160,18 +160,8 @@ post: label: 开启 - value: false label: 关闭 -# code_pretty: -# name: code_pretty -# label: 文章代码高亮主题 -# type: select -# default: light -# options: -# - value: Dark -# label: dark -# - value: light -# label: light social: - label: 社交设置 + label: 博客信息 items: social_github: name: social_github @@ -208,6 +198,113 @@ social: label: Telegram type: text placeholder: 'Telegram 用户名' + social_beian: + name: social_beian + label: 备案号 + type: text + placeholder: '备案号' + social_free: + name: social_free + label: 底部自定义 + type: textarea + default: '

    + Thanks for Halo   &    +

    ' + +plugins: + label: 插件 + items: + music: + name: music + label: 音乐播放器 + type: radio + data-type: bool + default: false + options: + - value: true + label: 开启 + - value: false + label: 关闭 + music_id: + name: music_id + label: 外链音乐Id (如果已开启音乐播放器, 此项必填) + type: text + default: '' + placeholder: '外链音乐Id' + kanbanniang: + name: kanbanniang + label: 看板娘 + type: radio + data-type: bool + default: false + options: + - value: true + label: 开启 + - value: false + label: 关闭 + busuanzi: + name: busuanzi + label: 不蒜子计数 + type: radio + data-type: bool + default: false + options: + - value: true + label: 开启 + - value: false + label: 关闭 + bokejishi: + name: bokejishi + label: 博客计时 + type: radio + data-type: bool + default: false + options: + - value: true + label: 开启 + - value: false + label: 关闭 + time_start: + name: time_start + label: 开始时间 (如果已开启博客计时, 此项必填) + type: text + default: '' + placeholder: '形如2019-08-10 00:00:00格式' + caidai: + name: caidai + label: 背景彩带 + type: radio + data-type: bool + default: false + options: + - value: true + label: 开启 + - value: false + label: 关闭 + xiantiao: + name: xiantiao + label: 背景线条 + type: radio + data-type: bool + default: false + options: + - value: true + label: 开启 + - value: false + label: 关闭 + dianji: + name: dianji + label: 鼠标点击特效 + type: radio + data-type: bool + default: false + options: + - value: true + label: 开启 + - value: false + label: 关闭 custom_links: label: 自定义链接 @@ -233,3 +330,5 @@ custom_links:

    ' + +