From ebdc06bd01d17f76e0e1f6ebf85defb25f35c1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=AA=E5=AD=90?= Date: Mon, 6 May 2024 16:34:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/zh-cn/archives/_index.md | 8 + .../zh-cn/archives/istoreos科学上网插件.md | 3 + .../群晖docker出现注册表无法访问的解决办法.md | 22 ++- content/zh-cn/categories/gears/_index.md | 5 - content/zh-cn/categories/hotels/_index.md | 6 - content/zh-cn/categories/life-style/_index.md | 5 - content/zh-cn/categories/zine/_index.md | 5 - content/zh-cn/friends/_index.md | 1 - hugo.toml | 2 +- themes/farallon/README.md | 155 ++++++++++++++++++ themes/farallon/README_CN.md | 153 +++++++++++++++++ themes/farallon/assets/images/desktop.ini | 2 - .../assets/scss/templates/footer.scss | 21 +++ .../assets/scss/templates/single.scss | 76 +++++++++ themes/farallon/assets/ts/app.ts | 2 +- themes/farallon/go.mod | 3 + themes/farallon/layouts/_default/single.html | 51 +----- .../farallon/layouts/_default/taxonomy.html | 4 +- themes/farallon/layouts/index.html | 2 +- .../farallon/layouts/partials/category.html | 13 ++ .../layouts/partials/commentlist.html | 23 ++- themes/farallon/layouts/partials/commets.html | 9 - themes/farallon/layouts/partials/footer.html | 6 + themes/farallon/layouts/partials/sns.html | 45 +++++ 24 files changed, 525 insertions(+), 97 deletions(-) create mode 100644 content/zh-cn/archives/_index.md delete mode 100644 content/zh-cn/categories/gears/_index.md delete mode 100644 content/zh-cn/categories/hotels/_index.md delete mode 100644 content/zh-cn/categories/life-style/_index.md delete mode 100644 content/zh-cn/categories/zine/_index.md create mode 100644 themes/farallon/README.md create mode 100644 themes/farallon/README_CN.md delete mode 100644 themes/farallon/assets/images/desktop.ini create mode 100644 themes/farallon/go.mod create mode 100644 themes/farallon/layouts/partials/category.html delete mode 100644 themes/farallon/layouts/partials/commets.html create mode 100644 themes/farallon/layouts/partials/sns.html diff --git a/content/zh-cn/archives/_index.md b/content/zh-cn/archives/_index.md new file mode 100644 index 0000000..bd11d53 --- /dev/null +++ b/content/zh-cn/archives/_index.md @@ -0,0 +1,8 @@ +--- +title: "文章归档" +menu: + main: + name: 文章 + weight: 10 +--- + \ No newline at end of file diff --git a/content/zh-cn/archives/istoreos科学上网插件.md b/content/zh-cn/archives/istoreos科学上网插件.md index 34f6506..9a22e35 100644 --- a/content/zh-cn/archives/istoreos科学上网插件.md +++ b/content/zh-cn/archives/istoreos科学上网插件.md @@ -12,6 +12,9 @@ OpenWRT应该也可以用 可以支持SSR SS VLESS VMESS等 + +{{}} + [SSR-Plus_x86_update.zip][1] diff --git a/content/zh-cn/archives/群晖docker出现注册表无法访问的解决办法.md b/content/zh-cn/archives/群晖docker出现注册表无法访问的解决办法.md index 6c46fbb..47a5edd 100644 --- a/content/zh-cn/archives/群晖docker出现注册表无法访问的解决办法.md +++ b/content/zh-cn/archives/群晖docker出现注册表无法访问的解决办法.md @@ -8,19 +8,25 @@ tags: - 群晖 --- -# 问题出现 +## 问题出现 + 群晖docker升级到DSM7.2之后出现了新的问题,原本可以正常访问的群晖镜像仓库竟然无法访问了. 原本启用注册表镜像URL就可以解决这个问题 如今也无法使用这个解决方案了 经过排查发现原来是因为docker仓库的域名被墙了. -# 解决办法 + +## 解决办法 + 使用魔法. -## 准备工作 -请参见[post cid="341" /] +### 准备工作 + 搭建一个代理服务,使用海外或者港台地区VPS -## 开启群晖SSH + +### 开启群晖SSH + ![微信截图_20230606091022.png][1] -## 使用SSH登录 + +### 使用SSH登录 `ssh 用户名@群晖IP`登录 例如 ``` @@ -46,7 +52,7 @@ mzz2017/v2raya 示例 192.168.31.100:2017 sock代理端口为20170 http代理端口为20171 -## 使用v2raya +### 使用v2raya 进入web管理界面点击创建 填写代理资料 @@ -56,7 +62,7 @@ http代理端口为20171 ![微信截图_20230606092047.png][4] ![设置.png][5] 设置完成后点击左上角的运行 -## 群晖设置 +### 群晖设置 打开控制面板-网络 ![群晖代理.png][6] 保存即可 diff --git a/content/zh-cn/categories/gears/_index.md b/content/zh-cn/categories/gears/_index.md deleted file mode 100644 index b916227..0000000 --- a/content/zh-cn/categories/gears/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "设备" -description: "富士相机和镜头" -cover: "https://static.fatesinger.com/2021/12/vhp6eou5x2wqh2zy.jpg" ---- diff --git a/content/zh-cn/categories/hotels/_index.md b/content/zh-cn/categories/hotels/_index.md deleted file mode 100644 index 77e36e3..0000000 --- a/content/zh-cn/categories/hotels/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: "酒店" -description: "酒店体验" -layout: travel -cover: "https://static.fatesinger.com/2023/11/lfvsapye5xvq2m9o.jpg" ---- diff --git a/content/zh-cn/categories/life-style/_index.md b/content/zh-cn/categories/life-style/_index.md deleted file mode 100644 index fbd3f29..0000000 --- a/content/zh-cn/categories/life-style/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "生活方式" -description: "hi" -cover: "https://static.fatesinger.com/2021/12/60n8hsw9ajd5y55r.jpg" ---- diff --git a/content/zh-cn/categories/zine/_index.md b/content/zh-cn/categories/zine/_index.md deleted file mode 100644 index 6777153..0000000 --- a/content/zh-cn/categories/zine/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "笔记" -description: "hi" -cover: "https://static.fatesinger.com/2023/10/aeqd36ewmo15vnzj.jpg" ---- diff --git a/content/zh-cn/friends/_index.md b/content/zh-cn/friends/_index.md index d06c46a..3d29bdb 100644 --- a/content/zh-cn/friends/_index.md +++ b/content/zh-cn/friends/_index.md @@ -2,7 +2,6 @@ title: "朋友们" subtitle: "blogroll" layout: "links" -wikipedia: "https://en.wikipedia.org/wiki/Bruce_Willis" menu: main: name: 链接 diff --git a/hugo.toml b/hugo.toml index 4265326..90a558c 100644 --- a/hugo.toml +++ b/hugo.toml @@ -35,7 +35,7 @@ theme = 'farallon' [taxonomies] category = 'categories' tag = 'tags' - + story = 'archives' [Params] search= true description = '资深网民孙先生.' diff --git a/themes/farallon/README.md b/themes/farallon/README.md new file mode 100644 index 0000000..ae1823a --- /dev/null +++ b/themes/farallon/README.md @@ -0,0 +1,155 @@ +# Hugo Theme Farallon + +![Hugo Theme Farallon](https://static.fatesinger.com/2023/06/u1ak8xgmyn9ec24r.png) + +Farallon is a simple single column hugo theme with perfect performace and elegance design. + +## Usage + +``` +git submodule add https://github.com/bigfa/hugo-theme-farallon.git themes/farallon + +echo "theme = 'farallon'" >> hugo.toml +``` + +[Full demo site](https://github.com/bigfa/bigfa.github.io) + +## Release Notes + +### 0.3.7 + +- add footer sns icons + +### 0.3.6 + +- add post category card +- add github icon + +### 0.3.5 + +- add author sns icons + +### 0.3.4 + +- change category file name + +### 0.3.3 + +- add post type memo + +### 0.3.2 + +- add story author card + +### 0.3.1 + +- add sticky icon +- fixed db list style in dark mode + +### 0.3.0 + +- add search + +### 0.2.11 + +- add link shortcode + +### 0.2.10 + +- fixed category list and tag list style +- relative time support i18n + +### 0.2.9 + +- fixed url render error +- add friend links template + +### 0.2.8 + +- add `pre` and `code` style + +### 0.2.7 + +- refactory taxonomy + +### 0.2.6 + +- toc style changed + +### 0.2.5 + +- Fixed ol list style error + +### 0.2.4 + +- Added a gear template + +### 0.2.3 + +- Added a “back to top” button. + +### 0.2.2 + +- Added support for table of contents (TOC). + +### 0.2.1 + +- Fixed compatibility issues with older versions of SCSS. + +### 0.2.0 + +- Added dark mode support. +- Fixed footer style issues on mobile devices. + +### 0.1.0 + +- Added theme information. + +### 0.0.8 + +- Fixed date formatting issue on Safari browser. + +### 0.0.7 + +- Changed to local item retrieval without the need for a token. + +### 0.0.6 + +- Added support for Douban items. + +Usage: + +Scan the QR code with WeChat at https://node.wpista.com/. + +Enter your Douban numeric ID and click “Save” to automatically sync your Douban records. + +Click “Get integration token” to generate a token. + +Add the following parameter to your site configuration: + +``` +[params] +wpdToken = 'token generated above' +``` + +### 0.0.5 + +- Fixed styling issues on category/tag pages. + +### 0.0.4 + +- Added relative time display. +- Included sample data. + +### 0.0.3 + +- Used normalize.css. + +### 0.0.2 + +- Added menu settings. +- Added a parameter to control the display of site owner information. + +### 0.0.1 + +- Initial setup. diff --git a/themes/farallon/README_CN.md b/themes/farallon/README_CN.md new file mode 100644 index 0000000..827e5f0 --- /dev/null +++ b/themes/farallon/README_CN.md @@ -0,0 +1,153 @@ +# Hugo Theme Farallon + +![Hugo 主题 Farallon](https://static.fatesinger.com/2023/06/u1ak8xgmyn9ec24r.png) + +## 使用方法 + +``` +git submodule add https://github.com/bigfa/hugo-theme-farallon.git themes/farallon + +echo "theme = 'farallon'" >> hugo.toml +``` + +[完整演示站点](https://github.com/bigfa/bigfa.github.io) + +## Release Note + +### 0.3.7 + +- 增加页脚 SNS 图标 + +### 0.3.6 + +- 增加文章分类卡片 +- 增加 Github 图标 + +### 0.3.5 + +- 增加作者 SNS 图标 + +### 0.3.4 + +- 修改分类文件名 + +### 0.3.3 + +- 增加状态文章格式 + +### 0.3.2 + +- 文章页增加作者信息 + +### 0.3.1 + +- 增加置顶标识 +- 修复豆瓣页面暗黑模式下的样式问题 + +### 0.3.0 + +- 增加搜索 + +### 0.2.11 + +- 文章内链短代码 + +### 0.2.10 + +- 修正分类和标签归档页样式问题 +- 相对时间多语言支持 + +### 0.2.9 + +- 修复链接渲染错误 +- 增加友情链接页面模版 + +### 0.2.8 + +- 增加 `pre` 和 `code` 标签样式 + +### 0.2.7 + +- 整理分类页面 + +### 0.2.6 + +- 文章目录样式更新 + +### 0.2.5 + +- 有序列表样式修正 + +### 0.2.4 + +- 增加了一个卡片页面 + +### 0.2.3 + +- 增加了返回顶部按钮 + +### 0.2.2 + +- 增加 TOC 支持 + +### 0.2.1 + +- 修复 scss 低版本兼容性问题 + +### 0.2.0 + +- 增加暗黑模式支持 +- 修复移动端 footer 样式问题 + +### 0.1.0 + +- 添加主题信息 + +### 0.0.8 + +- 修复 safari 浏览器下时间格式化错误的问题 + +### 0.0.7 + +- 修改为本地获取条目，无需设置 token + +### 0.0.6 + +- 新增豆瓣条目支持 + +使用方法 + +微信扫码登录https://node.wpista.com/ + +输入你的豆瓣数字 id，点击保存即可自动同步豆瓣记录。 + +点击 Get integration token 会生成一个 token。 + +在你的站点配置中加入参数 + +``` +[params] + wpdToken= '上面生成的token' +``` + +### 0.0.5 + +- 修复分类页/标签页样式错误 + +### 0.0.4 + +- 增加相对时间 +- 加入示例数据 + +### 0.0.3 + +- 使用`normalize.css` + +### 0.0.2 + +- 增加菜单设置 +- 增加一个是否显示站长信息的参数 + +### 0.0.1 + +初始化 diff --git a/themes/farallon/assets/images/desktop.ini b/themes/farallon/assets/images/desktop.ini deleted file mode 100644 index 415d343..0000000 --- a/themes/farallon/assets/images/desktop.ini +++ /dev/null @@ -1,2 +0,0 @@ -[LocalizedFileNames] -favicon.ico=@favicon.ico,0 diff --git a/themes/farallon/assets/scss/templates/footer.scss b/themes/farallon/assets/scss/templates/footer.scss index d5ecd89..2d84f51 100644 --- a/themes/farallon/assets/scss/templates/footer.scss +++ b/themes/farallon/assets/scss/templates/footer.scss @@ -52,6 +52,27 @@ } } } + + &__sns { + display: flex; + align-items: center; + a { + margin: 0 12px 0 0; + display: flex; + } + svg { + fill: var(--farallon-text-color); + &:hover { + fill: var(--farallon-hover-color); + } + width: 18px; + height: 18px; + &.sns { + fill: none; + stroke: var(--farallon-text-color); + } + } + } } @media (max-width: 768px) { diff --git a/themes/farallon/assets/scss/templates/single.scss b/themes/farallon/assets/scss/templates/single.scss index ca02d39..8d681a4 100644 --- a/themes/farallon/assets/scss/templates/single.scss +++ b/themes/farallon/assets/scss/templates/single.scss @@ -216,3 +216,79 @@ } } } + +.category--card { + padding: 15px 0; + display: flex; + align-items: center; + &__list { + border-top: 1px solid var(--farallon-border-color-light); + } + &__image { + img { + border-radius: 4px; + height: 64px; + object-fit: cover; + width: 64px; + // border: 1px solid var(--farallon-border-color); + } + margin-right: 15px; + width: 64px; + flex: 0 0 auto; + display: flex; + } + &__content { + flex: 1 1 auto; + } + &:hover { + .category--card__title { + color: var(--farallon-hover-color); + } + } + &__title { + font-size: 18px; + font-weight: bold; + margin-bottom: 10px; + line-height: 1; + } + &__description { + font-size: 14px; + color: var(--farallon-text-gray); + line-height: 1.2; + } + + & + & { + position: relative; + &::before { + position: absolute; + left: 15px; + right: 15px; + top: 0; + height: 1px; + background-color: var(--farallon-border-color-light); + content: ""; + } + } +} + +@media (max-width: 768px) { + .author--card { + padding: 20px 0; + } + .category--card { + padding: 12px 0; + &__image { + width: 48px; + img { + height: 48px; + width: 48px; + } + } + &__title { + font-size: 16px; + } + &__description { + font-size: 12px; + } + } +} diff --git a/themes/farallon/assets/ts/app.ts b/themes/farallon/assets/ts/app.ts index 662f698..1c49f8f 100644 --- a/themes/farallon/assets/ts/app.ts +++ b/themes/farallon/assets/ts/app.ts @@ -18,7 +18,7 @@ class farallonDate { years: "years ago", }; doms: Array = []; - VERSION: string = "0.3.1"; + VERSION: string = "0.3.7"; constructor(config: any) { this.selector = config.selector; if (config.timeFormat) { diff --git a/themes/farallon/go.mod b/themes/farallon/go.mod new file mode 100644 index 0000000..0d4eab9 --- /dev/null +++ b/themes/farallon/go.mod @@ -0,0 +1,3 @@ +module github.com/bigfa/hugo-theme-farallon + +go 1.22.2 diff --git a/themes/farallon/layouts/_default/single.html b/themes/farallon/layouts/_default/single.html index 9f584ab..4d82bf5 100644 --- a/themes/farallon/layouts/_default/single.html +++ b/themes/farallon/layouts/_default/single.html @@ -59,48 +59,11 @@
{{ .Site.Params.authorName }}
{{ .Site.Params.authorDescription }}
- {{ if .Site.Params.feed }} - - - - - - - - - {{ end }} - {{ if .Site.Params.telegram }} - - - - - - {{ end }} - {{ if .Site.Params.twitter }} - - - - - - {{ end }} - {{ if .Site.Params.instagram }} - - - - - - {{ end }} + {{ partial "sns.html" . }}
{{ end }} + {{ partial "category.html" . }} {{ partial "related.html" . }} {{ if .Params.twitter }}