fix(bug): bug Ohhh!

- Compress image size
     - Truncated character set
     - Compressed style sheet

README.md

@@ -1,19 +1,59 @@
-# Redemption 
+# halo-theme-Redemption
-一款 Halo 博客主题
 
-- [x] 深色模式
+Redemption 一款专注阅读、写作的主题。
-- [x] 媒体自适应
-- [ ] Markdown 样式设计
-- [ ] 导航栏
 
 ## 预览
 
-![](screenshot.png)
+- [7Wate's blog](https://blog.7wate.com/)
 
-![](source/images/darkmode.png)
+![预览](screenshot.png)
+
+![预览](source/images/index.gif)
+
+## 功能
+
+- [x] 专注阅读设计
+- [x] 深 / 浅色模式
+- [x] 全尺寸媒体自适应
+- [x] Markdown 样式设计
+- [x] 社交平台展示
+- [x] 支持独立页面
+- [ ] 字体切换
+- [ ] 导航栏
+
+## 配置
+
+### 主题设置
+
+- 自定义博客标题以及短语，并填写对应备案号。
+- 自定义显示[开往](https://travellings.link/)和[十年之约](https://www.foreverblog.cn/)的 logo。
+
+### 社交链接
+
+- 自定义关于页面、Github、哔哩哔哩、邮箱链接。
+
+### 评论设置
+
+- 自定义开启评论，默认关闭。
+
+### 图库设置
+
+- 自定义是否显示图库。
+- 自定义图库页面标题以及短语。
+
+## 评论
+
+**正常启用评论**，需要编辑主题在 `/source/plugins/comment/halo-comment.min.js` 文件中修改 `{baseUrl:"https://blog.7wate.com/"}` 双引号内的地址为你的博客地址。
+
+为了适配主题风格，Fork 了官方仓库自定义实现的评论组件。
+
+组件仓库：[7Wate](https://github.com/7Wate)/**[halo-comment-normal](https://github.com/7Wate/halo-comment-normal)**
+
+## 安装
+
+1. 远程拉取：https://github.com/7Wate/Redemption.git 复制地址点击下载
+2. 本地上传：在 [发布](https://github.com/7Wate/Redemption/releases) 页面，下载压缩包然后上传安装。
 
-![](source/images/870pxdrivce.png)
 ## 许可证
 
 GPL-v3.0 协议开源，请遵守开源协议。
-

journals.ftl

@@ -26,7 +26,7 @@
                         <#elseif (timeago >= 604800000) && (timeago < 3153600000)>
                             于 ${(timeago / 604800000)?int} 周前发表
                         <#elseif (timeago >= 3153600000) && (timeago < 94608000000)>
-                            于 ${(timeago / 3153600000)?int} 年前发表
+                            于 ${(timeago / 3153600000)?int} 月前发表
                         <#elseif (timeago >= 94608000000)>
                             发表于很久很久以前 ~
                         </#if>

module/header.ftl

@@ -7,10 +7,14 @@
     <div class="description">
         <p>${settings.sub_title!}</p>
         <div class="socials">
-            <a href="\about" title="关于我" target="_blank"><i class="ri-footprint-line"></i></a>
+            <#if settings.about??>
-            <a href="\photos" title="摄影集" target="_blank"><i class="ri-camera-line"></i></a>
+                <a href="${settings.about}" title="关于我" target="_blank"><i class="ri-footprint-line"></i></a>
-            <a href="\journals" title="日志" target="_blank"><i class="ri-message-3-line"></i></a>
+            </#if>
-            <a href="\archives" title="文章归档" target="_blank"><i class="ri-archive-line"></i></a>
+            <#if settings.open_photos!true>
+                <a href="${photos_url!}" title="摄影" target="_blank"><i class="ri-camera-line"></i></a>
+            </#if>
+            <a href="${journals_url!}" title="日志" target="_blank"><i class="ri-message-3-line"></i></a>
+            <a href="${archives_url!}" title="归档" target="_blank"><i class="ri-archive-line"></i></a>
             <#if settings.github??>
                 <a href="${settings.github}" title="Github" target="_blank"><i class="ri-github-line"></i></a>
             </#if>
@@ -20,8 +24,10 @@
             <#if settings.mail??>
                 <a href="mailto:${settings.mail}" title="邮箱" target="_blank"><i class="ri-mail-line"></i></a>
             </#if>
+            <#if settings.open_kaiwang!true>
                 <a href="https://travellings.link" title="开往" target="_blank"><i class="ri-train-line"></i></a>
-            <a href="\links" title="友链" target="_blank"><i class="ri-links-line"></i></a>
+            </#if>
+            <a href="${links_url!}" title="友链" target="_blank"><i class="ri-links-line"></i></a>
             <a href="${sitemap_html_url!}" type="application/sitemap" title="站点地图" target="_blank"><i class="ri-map-2-line"></i></a>
             <a href="${rss_url!}" type="application/rss+xml" title="RSS 订阅" target="_blank"><i class="ri-rss-line"></i></a>
         </div>

module/macro.ftl

@@ -9,40 +9,38 @@
         <meta name="keywords" content="${meta_keywords!}"/>
         <meta name="description" content="${meta_description!}" />
         <@global.head />
-        
+        <#if is_index??>
+        <#--  加速样式表  -->
+        <link rel="stylesheet" href="${theme_base!}/source/css/index.min.css"/>
+        <#else>
         <#--  公共样式表  -->
         <link rel="stylesheet" href="${theme_base!}/source/plugins/normalize.css"/>
         <link rel="stylesheet" href="${theme_base!}/source/plugins/animate.css"/>
         <link rel="stylesheet" href="${theme_base!}/source/plugins/remixicon/remixicon.css"/>
-        <link rel="stylesheet" href="${theme_base!}/source/plugins/heti/heti.min.css"/>
-        
         <#--  自定义样式表  -->
         <link rel="stylesheet" href="${theme_base!}/source/css/Redemption.css"/>
+        </#if>
     </head>
     <body>
         <div class="container  animate__animated animate__fadeInDown">
-
             <#--  主体  -->
             <#nested >
-
             <#-- 脚注   -->
             <footer>
-
                 <div class="copyright">
+                    <#if settings.open_foreverblog!true>
                     <a href="https://www.foreverblog.cn/" target="_blank" > 
-                        <img src="https://img.foreverblog.cn/logo_en_default.png" alt="" style="width:auto;height:16px;"> 
+                        <img src="${theme_base!}/source/images/logo_en_default.png" alt="" style="width:auto;height:1.25rem;"> 
                     </a>
-                    <a href="https://halo.run">Designed by 7Wate . Proudly published with Halo</a>
+                    </#if>
+                    <#if settings.footer_title??>
+                        <a href="https://halo.run">${settings.footer_title}</a>
+                    </#if>
                     <@global.footer />
-
                 </div>
-                
             </footer>
-            
         </div>
-
     </body>
-    <#--  <#include "menu.ftl">  -->
 </html>
 </#macro>
 

module/menu.ftl

@@ -1,13 +0,0 @@
-<@menuTag method="list">
-    <#--
-        ?sort_by('priority')：根据菜单的排序编号排序
-    -->
-    <div class="menu">
-        <#list menus?sort_by('priority') as menu>
-        <li>
-            <a href="${menu.url}" target="${menu.target!}">${menu.name} </a>
-        </li>
-    </#list>
-    </div>
-    
-</@menuTag>

photos.ftl

@@ -39,7 +39,7 @@
                         <#list photos.content as photo>
                             <article id="${photo.id!}" class="thumb">
                                 <a href="${photo.url!}" class="image">
-                                    <img src="${photo.url!}" alt="" />
+                                    <img src="${photo.thumbnail!}" alt="" />
                                 </a>
                                 <h2>${photo.name!}</h2>
                                 <p>${photo.description!}</p>

post.ftl

@@ -46,7 +46,7 @@
                     </span>
                 </div>
             </div>
-            <div class="heti">
+            <div class="markdown">
                 ${post.formatContent!}
             </div>
         </div>
@@ -54,9 +54,11 @@
             <a href="${blog_url!}" >
                 退回首页
             </a>
+            <#if settings.open_comment!false>
                 <a href="javascript:document.getElementById('comment').classList.remove('close')">
                     留下一言
                 </a>
+            </#if>
         </div>
     </main>
     <#include "module/comment.ftl"> 

settings.yaml

@@ -5,15 +5,46 @@ general:
       name: title
       label: 标题
       type: text
-      default: 'the site'
+      default: '救赎之路'
     sub_title:
       name: sub_title
-      label: 二级标题
+      label: 短语
       type: text
-      default: 'the site subtitle'
+      default: 'Always For Freedom'
+    footer_title:
+      name: footer_title
+      label: 脚注
+      type: text
+      default: 'Designed by 7Wate . Proudly published with Halo'
+    open_kaiwang:
+      name: open_kaiwang
+      label: 是否显示开往
+      type: radio
+      data-type: bool
+      default: true
+      options:
+        - value: true
+          label: 显示
+        - value: false
+          label: 关闭
+    open_foreverblog:
+      name:  open_foreverblog
+      label: 是否显示十年之约
+      type: radio
+      data-type: bool
+      default: true
+      options:
+        - value: true
+          label: 显示
+        - value: false
+          label: 关闭
 sns:
-  label: 社交资料
+  label: 社交链接
   items:
+    about:
+      name: github
+      label: 关于
+      type: text
     github:
       name: github
       label: Github
@@ -26,14 +57,42 @@ sns:
       name: mail
       label: 邮箱
       type: text
+comment:
+  label: 评论设置
+  items:
+    open_comment:
+      name:  open_comment
+      label: 是否开启评论
+      type: radio
+      data-type: bool
+      default: false
+      options:
+        - value: true
+          label: 显示
+        - value: false
+          label: 关闭
+      description: '开启评论需要编辑 /source/plugins/comment/halo-comment.min.js 搜索 baseUrl 关键字.
+      {baseUrl:"https://blog.7wate.com/"} 并将双引号内地址改为自己博客地址即可正常开启评论。
+      '
 photos:
   label: 图库设置
   items:
+    open_photos:
+      name: open_photos
+      label: 是否显示图库
+      type: radio
+      data-type: bool
+      default: true
+      options:
+        - value: true
+          label: 显示
+        - value: false
+          label: 关闭
     photoTitle:
       name: photoTitle
       label: 标题
       type: text
     photodes:
       name: photodes
-      label: 简述
+      label: 短语
       type: textarea

sheet.ftl

@@ -40,7 +40,7 @@
                     </span>
                 </div>
             </div>
-            <div class="heti">
+            <div class="markdown">
                 ${sheet.formatContent!}
             </div>
         </div>

source/css/Redemption.scss

@@ -9,6 +9,7 @@
 @import "pages/layout/footer";
 @import "pages/layout/pagenav";
 @import "pages/layout/comment";
+@import "pages/layout/bilibili";
 
 // 页面
 @import "pages/archives";

source/css/base/_base.scss

@@ -61,7 +61,7 @@ main {
   background: #ffffff;
   box-shadow: 0 0.375rem 1rem -0.5rem rgb(0, 0, 0, 0.17);
 
-  // =========== 深色 ===========
+  // =========== 暗模式 ===========
   @include darkmode {
     background: #292929;
     box-shadow: 0 0.375rem 1rem -0.5rem rgb(0, 0, 0, 0.34);
@@ -74,15 +74,21 @@ main {
     padding-bottom: 5%;
   }
 
+  // =========== 适配端 ===========
+  @media (min-width: 870px) and (max-width: 1440px) {
+    width: 71.8vw;
+    margin-top: 18.48vh;
+    padding-bottom: 7vh;
+  }
+
   // =========== 桌面端 ===========
-  @media (min-width: 870px) and (max-width: 2048px) {
+  @media (min-width: 1440px) {
-    width: 52rem;
+    width: 61.8vw;
-    margin-top: 4rem;
+    margin-top: 23.48vh;
-    padding-bottom: 3rem;
+    padding-bottom: 7vh;
   }
 }
 
-// 页面宽度
 main>.index,
 main>.archives,
 main>.categories,
@@ -103,38 +109,14 @@ main>.journals {
   }
 
   // =========== 桌面端 ===========
-  @media (min-width: 870px) and (max-width: 2048px) {
+  @media (min-width: 870px) {
-    width: 45rem;
+    width: 80%;
-    padding: 1rem 0.1rem 1rem 0.1rem;
+    padding: 2rem 0rem 2rem 0rem;
-  }
   }
 
-
-// 菜单 临时使用
-.menu {
-  position: fixed;
-  right: 0.5rem;
-  bottom: 10rem;
-  font-size: 0.5rem;
 }
 
 
-.heti{
-  max-width: 45rem!important;
-  > img{
-    width: 100%!important;
-  }
-}
-
-
-
-
-
-
-
-
-
-
 // 全局动画
 
 @-webkit-keyframes fadeInDown {

source/css/base/_font.scss

@@ -3,7 +3,6 @@
 html {
     font-variant-numeric: tabular-nums;
     -webkit-font-smoothing: antialiased;
-    font-size: 16px;
 
     // =========== 移动端 ===========
     @media (max-width: 870px) {
@@ -14,13 +13,49 @@ html {
         font-weight: 500;
     }
 
-    // =========== 桌面端 ===========
+    // =========== 适配端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) and (max-width: 1440px) {
-        font-size: 17px;
+        font-size: 20px;
         font-family: -apple-system, BlinksMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
         'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
         'Noto Color Emoji';
-        font-weight: 400;
+        font-weight: 500;
+    }
+
+    // =========== 桌面端 ===========
+    @media (min-width: 1440px) and (max-width: 1920px) {
+        font-size: 22px;
+        font-family: -apple-system, BlinksMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+        'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+        'Noto Color Emoji';
+        font-weight: 500;
+    }
+
+    // =========== 2K端 ===========
+    @media (min-width: 1920px) and (max-width: 2560px) {
+        font-size: 1.2vw;
+        font-family: -apple-system, BlinksMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+        'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+        'Noto Color Emoji';
+        font-weight: 500;
+    }
+
+    // =========== 4K端 ===========
+    @media (min-width: 2560px) and (max-width: 2880px) {
+        font-size: 1.25vw;
+        font-family: -apple-system, BlinksMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+        'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+        'Noto Color Emoji';
+        font-weight: 500;
+    }
+
+    // =========== >4K端 ===========
+    @media (min-width: 2880px) {
+        font-size: 1.27vw;
+        font-family: -apple-system, BlinksMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+        'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+        'Noto Color Emoji';
+        font-weight: 500;
     }
 }
 

source/css/markdown/_markdown.scss

@@ -1,3 +1,983 @@
-img {
+.markdown {
-    width: 100%
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  margin: 0;
+  color: #262626;
+  background-color: #ffffff;
+  @include darkmode {
+    color: #dbdbdb;
+    background-color: #292929;
+  }
+  line-height: 1.5;
+  word-wrap: break-word;
+  .octicon {
+    display: inline-block;
+    fill: currentColor;
+    vertical-align: text-bottom;
+    display: inline-block;
+    overflow: visible !important;
+    vertical-align: text-bottom;
+    fill: currentColor;
+  }
+  summary {
+    display: list-item;
+  }
+  [hidden] {
+    display: none !important;
+  }
+  a {
+    background-color: transparent;
+    color: #0969da;
+    @include darkmode {
+      color: #58a6ff;
+    }
+    text-decoration: none;
+    &:hover {
+      text-decoration: underline;
+    }
+    &:not([href]) {
+      color: inherit;
+      text-decoration: none;
+    }
+  }
+  abbr[title] {
+    border-bottom: none;
+    text-decoration: underline dotted;
+  }
+  dfn {
+    font-style: italic;
+  }
+  h1 {
+    margin: 0.67em 0;
+    font-weight: 600;
+    padding-bottom: 0.3em;
+    font-size: 2em;
+    border-bottom: 1px solid hsla(210, 18%, 87%, 1);
+    @include darkmode {
+        border-bottom: 1px solid #21262d;
+    }
+  }
+  mark {
+    background-color: #fff8c5;
+    color: #24292f;
+    @include darkmode {
+        background-color: rgba(187,128,9,0.15);
+        color: #c9d1d9;
+    }
+  }
+  small {
+    font-size: 90%;
+  }
+  sub {
+    bottom: -0.25em;
+  }
+  sup {
+    top: -0.5em;
+    & > a {
+      &::before {
+        content: "[";
+      }
+      &::after {
+        content: "]";
+      }
+    }
+  }
+  img {
+    border-style: none;
+    max-width: 100%;
+    box-sizing: content-box;
+    background-color: #ffffff;
+    @include darkmode {
+        background-color: #0d1117;
+    }
+  }
+  figure {
+    margin: 1em 40px;
+  }
+  hr {
+    box-sizing: content-box;
+    overflow: hidden;
+    background: transparent;
+    border-bottom: 1px solid hsla(210, 18%, 87%, 1);
+    @include darkmode {
+        border-bottom: 1px solid #21262d;
+    }
+    height: 0.25em;
+    padding: 0;
+    margin: 1.5rem 0rem;
+    background-color: #d0d7de;
+    @include darkmode {
+        background-color: #30363d;
+    }
+    border: 0;
+    &::before {
+      display: table;
+      content: "";
+    }
+    &::after {
+      display: table;
+      clear: both;
+      content: "";
+    }
+  }
+  input {
+    font: inherit;
+    margin: 0;
+    overflow: visible;
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+  }
+  [type="search"] {
+    -webkit-appearance: textfield;
+    outline-offset: -2px;
+  }
+  ::-webkit-input-placeholder {
+    color: inherit;
+    opacity: 0.54;
+  }
+  ::-webkit-file-upload-button {
+    -webkit-appearance: button;
+    font: inherit;
+  }
+  table {
+    border-spacing: 0;
+    border-collapse: collapse;
+    display: block;
+    width: max-content;
+    max-width: 100%;
+    overflow: auto;
+    th {
+      font-weight: 600;
+    }
+    tr {
+      background-color: #ffffff;
+      border-top: 1px solid hsla(210, 18%, 87%, 1);
+      @include darkmode {
+        background-color: #0d1117;
+        border-top: 1px solid #21262d;
+      }
+      &:nth-child(2n) {
+        background-color: #f6f8fa;
+        @include darkmode {
+            background-color: #161b22;
+        }
+      }
+    }
+    img {
+      background-color: transparent;
+    }
+  }
+  details {
+    summary {
+      cursor: pointer;
+    }
+    &:not([open]) {
+      & > *:not(summary) {
+        display: none !important;
+      }
+    }
+  }
+  kbd {
+    display: inline-block;
+    padding: 3px 5px;
+    font: 11px ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,
+      Liberation Mono, monospace;
+    line-height: 10px;
+    color: #24292f;
+    @include darkmode {
+        color: #c9d1d9;
+    }
+    vertical-align: middle;
+    background-color: #f6f8fa;
+    border: solid 1px rgba(175, 184, 193, 0.2);
+    border-bottom-color: rgba(175, 184, 193, 0.2);
+    @include darkmode {
+        background-color: #161b22;
+        border: solid 1px rgba(110,118,129,0.4);
+        border-bottom-color: rgba(110,118,129,0.4);
+    }
+    border-radius: 6px;
+    box-shadow: inset 0 -1px 0 rgba(175, 184, 193, 0.2);
+    @include darkmode {
+        box-shadow: inset 0 -1px 0 rgba(110,118,129,0.4);
+    }
+  }
+  h2 {
+    font-weight: 600;
+    padding-bottom: 0.3em;
+    font-size: 1.5em;
+    border-bottom: 1px solid hsla(210, 18%, 87%, 1);
+    @include darkmode {
+        border-bottom: 1px solid #21262d;
+    }
+  }
+  h3 {
+    font-weight: 600;
+    font-size: 1.25em;
+  }
+  h4 {
+    font-weight: 600;
+    font-size: 1em;
+  }
+  h5 {
+    font-weight: 600;
+    font-size: 0.875em;
+  }
+  h6 {
+    font-weight: 600;
+    font-size: 0.85em;
+    color: #57606a;
+    @include darkmode {
+        color: #8b949e;
+    }
+  }
+  p {
+    margin-top: 0;
+    margin-bottom: 0.625rem;
+  }
+  blockquote {
+    margin: 0;
+    padding: 0 1em;
+    color: #57606a;
+    border-left: 0.25em solid #d0d7de;
+    @include darkmode {
+        color: #8b949e;
+        border-left: .25em solid #30363d;
+    }
+    & > :first-child {
+      margin-top: 0;
+    }
+    & > :last-child {
+      margin-bottom: 0;
+    }
+  }
+  dd {
+    margin-left: 0;
+  }
+  pre {
+    margin-top: 0;
+    margin-bottom: 0;
+    font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,
+      Liberation Mono, monospace;
+    font-size: .75rem;
+    word-wrap: normal;
+    code {
+      font-size: 100%;
+    }
+    & > code {
+      padding: 0;
+      margin: 0;
+      word-break: normal;
+      white-space: pre;
+      background: transparent;
+      border: 0;
+    }
+  }
+  ::placeholder {
+    color: #6e7781;
+    @include darkmode{
+        color: #484f58;
+    }
+    opacity: 1;
+  }
+  .pl-c {
+    color: #6e7781;
+    @include darkmode {
+        color: #8b949e;
+    }
+  }
+  .pl-ent {
+    color: #116329;
+    @include darkmode {
+        color: #7ee787;
+    }
+  }
+  .pl-k {
+    color: #cf222e;
+    @include darkmode {
+        color: #ff7b72;
+    }
+  }
+  .pl-bu {
+    color: #82071e;
+    @include darkmode {
+        color: #f85149;
+    }
+  }
+  .pl-ii {
+    color: #f6f8fa;
+    background-color: #82071e;
+    @include darkmode {
+        color: #f0f6fc;
+        background-color: #8e1519;
+    }
+  }
+  .pl-c2 {
+    color: #f6f8fa;
+    background-color: #cf222e;
+    @include darkmode {
+        color: #f0f6fc;
+        background-color: #b62324;
+    }
+  }
+  .pl-sr {
+    .pl-cce {
+      font-weight: bold;
+      color: #116329;
+      @include darkmode {
+        color: #7ee787;
+      }
+    }
+  }
+  .pl-ml {
+    color: #3b2300;
+    @include darkmode {
+        color: #f2cc60;
+    }
+  }
+  .pl-mi {
+    font-style: italic;
+    color: #24292f;
+    @include darkmode {
+        color: #c9d1d9;
+    }
+  }
+  .pl-mb {
+    font-weight: bold;
+    color: #24292f;
+    @include darkmode {
+        color: #c9d1d9;
+    }
+  }
+  .pl-md {
+    color: #82071e;
+    background-color: #ffebe9;
+    @include darkmode {
+        color: #ffdcd7;
+        background-color: #67060c;
+    }
+  }
+  .pl-mi1 {
+    color: #116329;
+    background-color: #dafbe1;
+    @include darkmode {
+        color: #aff5b4;
+        background-color: #033a16;
+    }
+  }
+  .pl-mc {
+    color: #953800;
+    background-color: #ffd8b5;
+    @include darkmode {
+        color: #ffdfb6;
+        background-color: #5a1e02;
+    }
+  }
+  .pl-mi2 {
+    color: #eaeef2;
+    background-color: #0550ae;
+    @include darkmode {
+        color: #c9d1d9;
+        background-color: #1158c7;
+    }
+  }
+  .pl-mdr {
+    font-weight: bold;
+    color: #8250df;
+    @include darkmode {
+        color: #d2a8ff;
+    }
+  }
+  .pl-ba {
+    color: #57606a;
+    @include darkmode {
+        color: #8b949e;
+    }
+  }
+  .pl-sg {
+    color: #8c959f;
+    @include darkmode {
+        color: #484f58;
+    }
+  }
+  .pl-corl {
+    text-decoration: underline;
+    color: #0a3069;
+    @include darkmode {
+        color: #a5d6ff;
+    }
+  }
+  [data-catalyst] {
+    display: block;
+  }
+  g-emoji {
+    font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+    font-size: 1em;
+    font-style: normal !important;
+    font-weight: 400;
+    line-height: 1;
+    vertical-align: -0.075em;
+    img {
+      width: 1em;
+      height: 1em;
+    }
+  }
+  &::before {
+    display: table;
+    content: "";
+  }
+  &::after {
+    display: table;
+    clear: both;
+    content: "";
+  }
+  & > *:first-child {
+    margin-top: 0 !important;
+  }
+  & > *:last-child {
+    margin-bottom: 0 !important;
+  }
+  .absent {
+    color: #cf222e;
+    @include darkmode {
+        color: #f85149;
+    }
+  }
+  .anchor {
+    float: left;
+    padding-right: 4px;
+    margin-left: -20px;
+    line-height: 1;
+    &:focus {
+      outline: none;
+    }
+  }
+  ol[type="1"] {
+    list-style-type: decimal;
+  }
+  ol[type="a"] {
+    list-style-type: lower-alpha;
+  }
+  ol[type="i"] {
+    list-style-type: lower-roman;
+  }
+  div {
+    & > ol {
+      &:not([type]) {
+        list-style-type: decimal;
+      }
+    }
+  }
+  li {
+    & > p {
+      margin-top: 1rem;
+    }
+    & + li {
+      margin-top: 0.25em;
+    }
+  }
+  dl {
+    padding: 0;
+    dt {
+      padding: 0;
+      margin-top: 1rem;
+      font-size: 1em;
+      font-style: italic;
+      font-weight: 600;
+    }
+    dd {
+      padding: 0 1rem;
+      margin-bottom: 1rem;
+    }
+  }
+  img[align="right"] {
+    padding-left: 1.25rem;
+  }
+  img[align="left"] {
+    padding-right: 1.25rem;
+  }
+  .emoji {
+    max-width: none;
+    vertical-align: text-top;
+    background-color: transparent;
+  }
+  span {
+    &.frame {
+      display: block;
+      overflow: hidden;
+      & > span {
+        display: block;
+        float: left;
+        width: auto;
+        padding: 7px;
+        margin: 13px 0 0;
+        overflow: hidden;
+        border: 1px solid #d0d7de;
+        @include darkmode {
+            border: 1px solid #30363d;
+        }
+      }
+      span {
+        img {
+          display: block;
+          float: left;
+        }
+        span {
+          display: block;
+          padding: 5px 0 0;
+          clear: both;
+          color: #24292f;
+          @include darkmode {
+            color: #c9d1d9;
+          }
+        }
+      }
+    }
+    &.align-center {
+      display: block;
+      overflow: hidden;
+      clear: both;
+      & > span {
+        display: block;
+        margin: 13px auto 0;
+        overflow: hidden;
+        text-align: center;
+      }
+      span {
+        img {
+          margin: 0 auto;
+          text-align: center;
+        }
+      }
+    }
+    &.align-right {
+      display: block;
+      overflow: hidden;
+      clear: both;
+      & > span {
+        display: block;
+        margin: 13px 0 0;
+        overflow: hidden;
+        text-align: right;
+      }
+      span {
+        img {
+          margin: 0;
+          text-align: right;
+        }
+      }
+    }
+    &.float-left {
+      display: block;
+      float: left;
+      margin-right: 13px;
+      overflow: hidden;
+      span {
+        margin: 13px 0 0;
+      }
+    }
+    &.float-right {
+      display: block;
+      float: right;
+      margin-left: 13px;
+      overflow: hidden;
+      & > span {
+        display: block;
+        margin: 13px auto 0;
+        overflow: hidden;
+        text-align: right;
+      }
+    }
+  }
+  del {
+    code {
+      text-decoration: inherit;
+    }
+  }
+  .highlight {
+    margin-bottom: 1rem;
+    pre {
+      margin-bottom: 0;
+      word-break: normal;
+    }
+  }
+  .csv-data {
+    .blob-num {
+      padding: 10px 8px 9px;
+      text-align: right;
+      background: #ffffff;
+      @include darkmode {
+        background: #0d1117;
+      }
+      border: 0;
+    }
+    tr {
+      border-top: 0;
+    }
+    th {
+      font-weight: 600;
+      background: #f6f8fa;
+      @include darkmode {
+        background: #161b22;
+      }
+      border-top: 0;
+    }
+  }
+  .footnotes {
+    font-size: 0.75rem;
+    color: #57606a;
+    border-top: 1px solid #d0d7de;
+    @include darkmode {
+        color: #8b949e;
+        border-top: 1px solid #30363d;
+    }
+    ol {
+      padding-left: 1rem;
+    }
+    li {
+      position: relative;
+      &:target {
+        color: #24292f;
+        @include darkmode {
+            color: #c9d1d9;
+        }
+        &::before {
+          position: absolute;
+          top: -8px;
+          right: -8px;
+          bottom: -8px;
+          left: -24px;
+          pointer-events: none;
+          content: "";
+          border: 2px solid #0969da;
+          @include darkmode {
+            border: 2px solid #1f6feb;
+          }
+          border-radius: 6px;
+        }
+      }
+    }
+    .data-footnote-backref {
+      g-emoji {
+        font-family: monospace;
+      }
+    }
+  }
+  .task-list-item {
+    list-style-type: none;
+    label {
+      font-weight: 400;
+    }
+    &.enabled {
+      label {
+        cursor: pointer;
+      }
+    }
+    & + .task-list-item {
+      margin-top: 3px;
+    }
+    .handle {
+      display: none;
+    }
+  }
+  .task-list-item-checkbox {
+    margin: 0 0.2em 0.25em -1.6em;
+    vertical-align: middle;
+  }
+  .contains-task-list {
+    &:dir(rtl) {
+      .task-list-item-checkbox {
+        margin: 0 -1.6em 0.25em 0.2em;
+      }
+    }
+  }
+  ::-webkit-calendar-picker-indicator {
+    filter: invert(50%);
+  }
+}
+.markdown h1:hover .anchor .octicon-link:before,
+.markdown h2:hover .anchor .octicon-link:before,
+.markdown h3:hover .anchor .octicon-link:before,
+.markdown h4:hover .anchor .octicon-link:before,
+.markdown h5:hover .anchor .octicon-link:before,
+.markdown h6:hover .anchor .octicon-link:before {
+  width: 1rem;
+  height: 1rem;
+  content: " ";
+  display: inline-block;
+  background-color: currentColor;
+  -webkit-mask-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' version='1.1' aria-hidden='true'><path fill-rule='evenodd' d='M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z'></path></svg>");
+  mask-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' version='1.1' aria-hidden='true'><path fill-rule='evenodd' d='M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z'></path></svg>");
+}
+.markdown details,
+.markdown figcaption,
+.markdown figure {
+  display: block;
+}
+.markdown a:active,
+.markdown a:hover {
+  outline-width: 0;
+}
+.markdown b,
+.markdown strong {
+  font-weight: 600;
+}
+.markdown sub,
+.markdown sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+.markdown code,
+.markdown kbd,
+.markdown pre,
+.markdown samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+.markdown [type="button"],
+.markdown [type="reset"],
+.markdown [type="submit"] {
+  -webkit-appearance: button;
+}
+.markdown [type="button"]::-moz-focus-inner,
+.markdown [type="reset"]::-moz-focus-inner,
+.markdown [type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+.markdown [type="button"]:-moz-focusring,
+.markdown [type="reset"]:-moz-focusring,
+.markdown [type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+.markdown [type="checkbox"],
+.markdown [type="radio"] {
+  box-sizing: border-box;
+  padding: 0;
+}
+.markdown [type="number"]::-webkit-inner-spin-button,
+.markdown [type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+.markdown [type="search"]::-webkit-search-cancel-button,
+.markdown [type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+.markdown td,
+.markdown th {
+  padding: 0;
+}
+.markdown h1,
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  margin-top: 1.5rem;
+  margin-bottom: 1rem;
+  font-weight: 600;
+  line-height: 1.25;
+}
+.markdown ul,
+.markdown ol {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-left: 2em;
+}
+.markdown ol ol,
+.markdown ul ol {
+  list-style-type: lower-roman;
+}
+.markdown ul ul ol,
+.markdown ul ol ol,
+.markdown ol ul ol,
+.markdown ol ol ol {
+  list-style-type: lower-alpha;
+}
+.markdown tt,
+.markdown code {
+  font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,
+    Liberation Mono, monospace;
+  font-size: 0.75rem;
+}
+.markdown input::-webkit-outer-spin-button,
+.markdown input::-webkit-inner-spin-button {
+  margin: 0;
+  -webkit-appearance: none;
+  appearance: none;
+}
+.markdown .pl-c1,
+.markdown .pl-s .pl-v {
+  color: #0550ae;
+  @include darkmode {
+    color: #79c0ff;
+  }
+}
+.markdown .pl-e,
+.markdown .pl-en {
+  color: #8250df;
+  @include darkmode {
+    color: #d2a8ff;
+  }
+}
+.markdown .pl-smi,
+.markdown .pl-s .pl-s1 {
+  color: #24292f;
+  @include darkmode {
+    color: #c9d1d9;
+  }
+}
+.markdown .pl-s,
+.markdown .pl-pds,
+.markdown .pl-s .pl-pse .pl-s1,
+.markdown .pl-sr,
+.markdown .pl-sr .pl-cce,
+.markdown .pl-sr .pl-sre,
+.markdown .pl-sr .pl-sra {
+  color: #0a3069;
+  @include darkmode {
+    color: #a5d6ff;
+  }
+}
+.markdown .pl-v,
+.markdown .pl-smw {
+  color: #953800;
+  @include darkmode {
+    color: #ffa657;
+  }
+}
+.markdown .pl-mh,
+.markdown .pl-mh .pl-en,
+.markdown .pl-ms {
+  font-weight: bold;
+  color: #0550ae;
+  @include darkmode {
+    color: #1f6feb;
+  }
+}
+.markdown p,
+.markdown blockquote,
+.markdown ul,
+.markdown ol,
+.markdown dl,
+.markdown table,
+.markdown pre,
+.markdown details {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+.markdown h1 .octicon-link,
+.markdown h2 .octicon-link,
+.markdown h3 .octicon-link,
+.markdown h4 .octicon-link,
+.markdown h5 .octicon-link,
+.markdown h6 .octicon-link {
+  color: #24292f;
+  @include darkmode {
+    color: #c9d1d9;
+  }
+  vertical-align: middle;
+  visibility: hidden;
+}
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  text-decoration: none;
+}
+.markdown h1:hover .anchor .octicon-link,
+.markdown h2:hover .anchor .octicon-link,
+.markdown h3:hover .anchor .octicon-link,
+.markdown h4:hover .anchor .octicon-link,
+.markdown h5:hover .anchor .octicon-link,
+.markdown h6:hover .anchor .octicon-link {
+  visibility: visible;
+}
+.markdown h1 tt,
+.markdown h1 code,
+.markdown h2 tt,
+.markdown h2 code,
+.markdown h3 tt,
+.markdown h3 code,
+.markdown h4 tt,
+.markdown h4 code,
+.markdown h5 tt,
+.markdown h5 code,
+.markdown h6 tt,
+.markdown h6 code {
+  padding: 0 0.2em;
+  font-size: inherit;
+}
+.markdown ul.no-list,
+.markdown ol.no-list {
+  padding: 0;
+  list-style-type: none;
+}
+.markdown ul ul,
+.markdown ul ol,
+.markdown ol ol,
+.markdown ol ul {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+.markdown table th,
+.markdown table td {
+  padding: .375rem 0.875rem;
+  border: 1px solid #d0d7de;
+  @include darkmode {
+    border: 1px solid #30363d;
+  }
+}
+.markdown code,
+.markdown tt {
+  padding: 0.2em 0.4em;
+  margin: 0;
+  font-size: 85%;
+  background-color: rgba(175, 184, 193, 0.2);
+  @include darkmode {
+    background-color: rgba(110,118,129,0.4);
+  }
+  border-radius: 6px;
+}
+.markdown code br,
+.markdown tt br {
+  display: none;
+}
+.markdown .highlight pre,
+.markdown pre {
+  padding: 1rem;
+  overflow: auto;
+  font-size: 85%;
+  line-height: 1.45;
+  background-color: #f6f8fa;
+  @include darkmode {
+    background-color: #161b22;
+  }
+  border-radius: 6px;
+}
+.markdown pre code,
+.markdown pre tt {
+  display: inline;
+  max-width: auto;
+  padding: 0;
+  margin: 0;
+  overflow: visible;
+  line-height: inherit;
+  word-wrap: normal;
+  background-color: transparent;
+  border: 0;
+}
+.markdown .csv-data td,
+.markdown .csv-data th {
+  padding: 5px;
+  overflow: hidden;
+  font-size: 0.75rem;
+  line-height: 1;
+  text-align: left;
+  white-space: nowrap;
 }

source/css/pages/_archives.scss

@@ -6,8 +6,6 @@
  * 1.默认
  * 2.深色
  * 3.媒体查询
- *   - 870px
- *   - 2048px
 */
 @import "../base/variables";
 
@@ -83,7 +81,7 @@
         }
     }
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) {
         >ul {
             padding: 0.625rem 0.1rem;
 

source/css/pages/_category.scss

@@ -6,8 +6,6 @@
  * 1.默认
  * 2.深色
  * 3.媒体查询
- *   - 870px
- *   - 2048px
 */
 @import "../base/variables";
 
@@ -79,7 +77,7 @@
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) {
         >ul {
             padding: 0.625rem 0.1rem;
             >.name {
@@ -156,7 +154,7 @@
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px){
         margin: 5rem 0;
 
         >ul {

source/css/pages/_index.scss

@@ -6,8 +6,7 @@
  * 1.默认
  * 2.深色
  * 3.媒体查询
- *   - 870px
+ *
- *   - 2048px
 */
 @import "../base/variables";
 
@@ -117,7 +116,7 @@
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) {
 
         >.info {
             padding: 0.5rem 0 2rem 0;
@@ -126,4 +125,5 @@
             }
         }
     }
+
 }

source/css/pages/_journals.scss

@@ -6,8 +6,7 @@
  * 1.默认
  * 2.深色
  * 3.媒体查询
- *   - 870px
+ * 
- *   - 2048px
 */
 @import "../base/variables";
 .journals {
@@ -72,14 +71,14 @@
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) {
         >.name {
             padding: 0.5rem 0;
         }
         >ul {
             >li {
+                list-style-type: none;
                 padding: 1rem 0.1rem;
-
                 >.info {
                     padding: 1rem 0;
                 }

source/css/pages/_links.scss

@@ -6,8 +6,7 @@
  * 1.默认
  * 2.深色
  * 3.媒体查询
- *   - 870px
+ *
- *   - 2048px
 */
 @import "../base/variables";
 .links {
@@ -72,7 +71,7 @@
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) {
         >ul {
             padding: 0.625rem 0.1rem;
 

source/css/pages/_post.scss

@@ -6,8 +6,7 @@
  * 1.默认
  * 2.深色
  * 3.媒体查询
- *   - 870px
+ * 
- *   - 2048px
 */
 @import "../base/variables";
 .post {
@@ -54,7 +53,7 @@
                 >a {
                     color: #dbdbdb;
                     
-                    :hover {
+                    &:hover {
                         color: #dbdbdb80;
                     }
                 }
@@ -74,7 +73,7 @@
     }
 
     // =========== 移动端 ===========
-    @media (min-width: 320px) and (max-width: 870px) {
+    @media (max-width: 870px) {
         >.title {
             margin-top: 10%;
             >.info{
@@ -88,7 +87,7 @@
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px){
         >.title {
             margin-top: 4rem;
             >.info{

source/css/pages/_tag.scss

@@ -6,8 +6,7 @@
  * 1.默认
  * 2.深色
  * 3.媒体查询
- *   - 870px
+ * 
- *   - 2048px
 */
 @import "../base/variables";
 .tag {
@@ -77,7 +76,7 @@
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) {
         >ul {
             padding: 0.625rem 0.1rem;
             >.name {
@@ -150,7 +149,7 @@
         }
     }
     // =========== 移动端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) {
         margin: 5rem 0;
 
         >ul {

source/css/pages/layout/_bilibili.scss

@@ -0,0 +1,22 @@
+
+.post {
+    iframe {
+        width: 97%;
+        margin: 0.5rem 0;
+    }
+
+
+    // =========== 移动端 ===========
+    @media (min-width: 320px) and (max-width: 870px) {
+        iframe {
+            height: 47vh;
+        }
+    }
+
+    // =========== 桌面端 ===========
+    @media (min-width: 870px){
+        iframe {
+            height: 87vh;
+        }
+    }
+}

source/css/pages/layout/_comment.scss

@@ -7,10 +7,17 @@
         margin: 5% 0;
     }
 
+    // =========== 适配端 ===========
+    @media (min-width: 870px) and (max-width: 1440px) {
+        width: 71.8vw;
+        margin-top: 18.48vh;
+        padding-bottom: 7vh;
+    }
+
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 1440px){
         margin-top: 2rem;
-        width: 52rem;
+        width: 61.8vw;
     }
 }
 
@@ -43,16 +50,15 @@
 
     // =========== 移动端 ===========
     @media (max-width: 870px) {
-        margin-top: 7%;
+        margin-top: 5%;
         padding-top: 5%;
         width: 80%;
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px){
-        margin-top: 2rem;
         padding-top: 2rem;
-        width: 40rem;
+        width: 77%;
     }
 }
 

source/css/pages/layout/_footer.scss

@@ -38,7 +38,7 @@ footer {
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px){
         padding: 2rem 0;
     }
 }

source/css/pages/layout/_header.scss

@@ -90,9 +90,9 @@
     }
 
     // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px){
-        width: 45rem;
+        width: 80%;
-        padding: 7rem 0 3rem 0;
+        padding: 8rem 0 4rem 0;
         justify-content: space-between;
 
         >.title {

source/css/pages/layout/_pagenav.scss

@@ -30,7 +30,8 @@
     }
 
     // // =========== 桌面端 ===========
-    @media (min-width: 870px) and (max-width: 2048px) {
+    @media (min-width: 870px) {
         padding: 2rem 0;
     }
+
 }

source/plugins/normalize.css

@@ -360,6 +360,6 @@
    */
 
   ul,li{
-    list-style-type: none;
+    /* list-style-type: none; */
     padding: 0;
   }

theme.yaml

@@ -4,9 +4,9 @@ name: Redemption
 author:
   name: 7Wate
   website: https://7wate.com
-description: The road of Redemption
+description: The road of Redemption | 救赎之路
 logo: 
 website: https://7wate.com
 repo: https://github.com/7Wate/Redemption
-version: 0.1.0
+version: 1.0.1
-require: 1.4.2
+require: 1.5.0