From f2bb3ef9d7103482362c251e0ab377b6e6c54e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=AA=E5=AD=90?= <jkjoy@live.cn>
Date: Mon, 1 Jul 2024 10:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 archive.php                            |  24 +-
 comments.php                           | 356 -------------------------
 part/footer.php => footer.php          |   0
 part/header.php => header.php          |  28 ++
 index.php                              |  57 +++-
 page-archives.php                      |   6 +-
 page-categories.php                    |   6 +-
 part/sns.php => page-home.php          |  22 +-
 page-links.php                         |   6 +-
 page-tags.php                          |   6 +-
 page.php                               |   6 +-
 part/head.php                          |  28 --
 part/paginator.php                     |  67 -----
 part/profile.php                       |  11 -
 post.php                               |   8 +-
 dist/js/script.js => script.js         |   0
 dist/css/style.css => style.css        | 354 +++++++++++++++++++++++-
 part/toc.php => toc.php                |   0
 dist/js/tocbot.min.js => tocbot.min.js |   0
 19 files changed, 483 insertions(+), 502 deletions(-)
 rename part/footer.php => footer.php (100%)
 rename part/header.php => header.php (58%)
 rename part/sns.php => page-home.php (94%)
 delete mode 100644 part/head.php
 delete mode 100644 part/paginator.php
 delete mode 100644 part/profile.php
 rename dist/js/script.js => script.js (100%)
 rename dist/css/style.css => style.css (82%)
 rename part/toc.php => toc.php (100%)
 rename dist/js/tocbot.min.js => tocbot.min.js (100%)

diff --git a/archive.php b/archive.php
index 368b688..2888d1b 100644
--- a/archive.php
+++ b/archive.php
@@ -1,8 +1,6 @@
 <?php 
 if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php $this->need('part/head.php'); ?>
-<div class="wrapper">
-<?php $this->need('part/header.php'); ?>
+<?php $this->need('header.php'); ?>
 <div class="main">
 <div class="post-wrap archive">
     <h2 class="post-title">-&nbsp;<?php $this->archiveTitle(array(
@@ -37,6 +35,22 @@ while($this->next()):
 <?php endif; ?>   
 
 </div>
-<?php $this->need('part/paginator.php'); ?>
+<?php
+            $this->pagenav(
+                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10.8284 12.0007L15.7782 16.9504L14.364 18.3646L8 12.0007L14.364 5.63672L15.7782 7.05093L10.8284 12.0007Z" fill="var(--main)"></path></svg>',
+                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.1714 12.0007L8.22168 7.05093L9.63589 5.63672L15.9999 12.0007L9.63589 18.3646L8.22168 16.9504L13.1714 12.0007Z" fill="var(--main)"></path></svg>',
+                1,
+                '...',
+                array(
+                    'wrapTag' => 'div',
+                    'wrapClass' => 'pagination_page',
+                    'itemTag' => '',
+                    'textTag' => 'a',
+                    'currentClass' => 'active',
+                    'prevClass' => 'prev',
+                    'nextClass' => 'next'
+                )
+            );
+        ?>   
 </div>  
-<?php $this->need('part/footer.php'); ?>
\ No newline at end of file
+<?php $this->need('footer.php'); ?>
\ No newline at end of file
diff --git a/comments.php b/comments.php
index 22fbfa5..9be0707 100644
--- a/comments.php
+++ b/comments.php
@@ -1,360 +1,4 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<style>
-/* 分页 */
-.pagination_page{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-top: var(--margin);
-    gap: 0.5rem;
-}
-.pagination_page li.active a {
-    background: var(--theme);
-    color: #fff;
-    font-weight: 500;
-}
-.pagination_page a{
-    display: flex;
-    padding: 0.5rem;
-    font-size: 0.9rem;
-    width: 1.75rem;
-    height: 1.75rem;
-    background: var(--background);
-    border-radius: 50%;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    transition: 0.2s;
-    -webkit-transition: 0.2s;
-    justify-content: center;
-    align-items: center;
-    letter-spacing: 0;
-}
-.pagination_page span.next{
-    cursor: pointer;
-}
-.pagination_page li.active a:hover{
-    cursor: not-allowed;
-}
-.comment-form label {
-    display: block;
-    margin-bottom: .5rem;
-    font-size: 14px;
-    cursor: pointer;
-    line-height: 1.4
-}
-
-.comment-form label .required {
-    color: red
-}
-
-.comment-form input,
-.comment-form textarea {
-    width: 100%;
-    resize: none;
-    border-radius: 5px;
-    box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 8px 15px;
-    font-size: 14px
-}
-
-.comment-form .submit {
-    background-color: #000;
-    color: #fff;
-    border: 0;
-    font-size: 14px;
-    cursor: pointer;
-    padding: 8px 30px;
-    border-radius: 5px;
-    width: auto
-}
-
-.comment-form .submit:hover {
-    background-color: var(--farallon-text-light)
-}
-
-.comment-form p {
-    margin-bottom: 15px
-}
-
-.comment-form p:last-of-type {
-    margin-bottom: 0
-}
-
-.comment-form .comment-notes,
-.comment-form .logged-in-as {
-    font-size: 12px;
-    color: var(--farallon-text-gray)
-}
-
-.comment-reply-title {
-    font-weight: 700;
-    font-size: 18px;
-    display: flex;
-    align-items: center
-}
-
-.comment-reply-title small {
-    margin-left: auto;
-    font-weight: 400;
-    font-size: 14px
-}
-
-.commentlist {
-    border-top: 1px solid var(--farallon-border-color-light);
-    list-style: none;
-    padding-top: 10px
-}
-
-.commentlist .comment {
-    padding: 0 0
-}
-
-.commentlist .comment-respond {
-    margin-top: 20px;
-    padding: 20px;
-    background-color: var(--farallon-background-gray);
-    border-radius: 5px
-}
-
-@keyframes comment--fresh {
-    0% {
-        background-color: #fff
-    }
-
-    100% {
-        background-color: #fffee0
-    }
-}
-
-.comment:last-child>.comment-body {
-    border-bottom: 0
-}
-
-.comment.parent {
-    border-bottom: 1px solid var(--farallon-border-color-light)
-}
-
-.comment.parent:last-child {
-    border-bottom: 0
-}
-
-.comment-body {
-    padding: 25px 0
-}
-
-.comment-body__fresh {
-    animation: comment--fresh 1.5s ease-in-out infinite alternate;
-    border-radius: 5px
-}
-
-.comment-body .avatar {
-    transition: .5s box-shadow
-}
-
-.comment-body:hover .avatar {
-    box-shadow: 0 0 3px 0 var(--farallon-hover-color)
-}
-
-.comment--avatar {
-    flex: none;
-    margin-right: 10px;
-    display: flex
-}
-
-.comment--author {
-    flex: auto;
-    display: flex;
-    align-items: center
-}
-
-.comment--author .comment-reply-link {
-    margin-left: auto
-}
-
-.comment--author .comment-reply-link svg {
-    fill: var(--farallon-text-gray);
-    width: 15px;
-    height: 15px
-}
-
-.comment--author .comment-reply-link:hover svg {
-    fill: var(--farallon-hover-color)
-}
-
-.comment--author a {
-    color: var(--farallon-main-color)
-}
-
-.comment--author a:hover {
-    color: var(--farallon-hover-color);
-    text-decoration: underline
-}
-
-.comment--meta {
-    display: flex;
-    align-items: center;
-    flex: auto
-}
-
-.comment--time {
-    color: var(--farallon-text-light)
-}
-
-.comment-meta {
-    display: flex;
-    align-items: center
-}
-
-.comment-meta .avatar {
-    border-radius: 100%
-}
-
-
-div.cancel-comment-reply.cancel-comment-reply-link {
-    text-align: right;
-}
-
-.comment-content {
-    word-wrap: break-word !important;
-    overflow-wrap: break-word !important;
-    white-space: normal !important;
-    color: var(--farallon-text-light)
-}
-
-.comment-content a {
-    text-decoration: underline
-}
-
-.comment-content a:hover {
-    color: var(--farallon-hover-color)
-}
-
-.children {
-    margin-left: 0;
-    padding-bottom: 10px
-}
-
-.children .avatar {
-    width: 32px;
-    height: 32px
-}
-
-.children .comment-body {
-    border-bottom: 0;
-    padding: 15px 0
-}
-
-.children .comment-content {
-    font-size: 14px
-}
-
-.parent>.children {
-    margin-left: 50px
-}
-
-.comment-meta {
-    margin-bottom: 10px;
-    font-size: 14px;
-    display: flex;
-    align-items: center
-}
-
-.comment-meta .comment-metadata {
-    margin-left: auto
-}
-
-.comment-reply-link {
-    font-size: 12px
-}
-
-.no--comment {
-    text-align: center;
-    padding: 30px 0
-}
-
-.comments--title {
-    margin-top: 30px;
-    font-size: 18px;
-    font-weight: 700;
-    margin-bottom: 10px;
-    display: flex;
-    align-items: center
-}
-
-.comments--title svg {
-    width: 24px;
-    height: 24px;
-    margin-right: 5px;
-    position: relative;
-    transform: translate3d(0, 1px, 0);
-    fill: var(--farallon-text-color)
-}
-
-.comment-respond {
-    padding-top: 30px
-}
-
-.comment-form-cookies-consent #wp-comment-cookies-consent {
-    display: none
-}
-
-.comment-form-cookies-consent label {
-    font-size: 14px;
-    color: var(--farallon-text-gray);
-    display: flex;
-    align-items: center;
-    position: relative
-}
-
-.comment-form-cookies-consent label::before {
-    background-color: #fff;
-    border: 1px solid rgba(0, 0, 0, .15);
-    border-radius: 100%;
-    height: 16px;
-    margin-right: 6px;
-    vertical-align: middle;
-    width: 16px;
-    content: "";
-    flex: none
-}
-.dot::before {
-    content: "·";
-    margin-left: 4px;
-    margin-right: 4px
-}
-
-.comment-form-cookies-consent input:checked+label::after {
-    background-color: var(--farallon-main-color);
-    border-radius: 100%;
-    content: "";
-    position: absolute;
-    left: 1px;
-    height: 12px;
-    margin: 2px;
-    width: 12px;
-    flex: none
-}
-/* 去除有序列表（<ol>）的列表号 */
-ol.comment-list {
-    list-style-type: none;
-    padding-left: 0; /* 取消左侧的默认填充 */
-}
-
-/* 去除无序列表（<ul>）的列表号 */
-ul.comment-list {
-    list-style-type: none;
-    padding-left: 0; /* 取消左侧的默认填充 */
-}
-
-/* 适用于所有嵌套的评论列表 */
-ol.comment-list li, ul.comment-list li {
-    list-style-type: none;
-}
-/* 分页 */
-</style>
  <div class="post--ingle__comments">
     <?php $this->comments()->to($comments); ?>
     <?php if($this->allow('comment')): ?>
diff --git a/part/footer.php b/footer.php
similarity index 100%
rename from part/footer.php
rename to footer.php
diff --git a/part/header.php b/header.php
similarity index 58%
rename from part/header.php
rename to header.php
index 59166d5..bf57e4c 100644
--- a/part/header.php
+++ b/header.php
@@ -1,4 +1,32 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+<meta http-equiv="X-UA-Compatible" content="ie=edge">
+<meta name="author" content="<?php $this->options->author() ?>">
+<meta name="description" content="<?php $this->options->description() ?>">
+<meta name="keywords" content="<?php $this->options->keywords() ?>">
+<title>
+    <?php if($this->_currentPage>1) echo '第 '.$this->_currentPage.' 页 - '; ?><?php $this->archiveTitle(array(
+            'category'  =>  _t('分类 %s 下的文章'),
+            'search'    =>  _t('包含关键字 %s 的文章'),
+            'tag'       =>  _t('标签 %s 下的文章'),
+            'date'      =>  _t('在<span> %s </span>发布的文章'),
+            'author'    =>  _t('%s 发布的文章')
+        ), '', ' - '); ?><?php if ($this->is('post')) $this->category(',', false);?><?php if ($this->is('post')) echo ' - ';?><?php $this->options->title(); ?><?php if ($this->is('index')) echo ' - '; ?><?php if ($this->is('index')) $this->options->description() ?>
+</title>
+<link rel="icon" href="<?php $this->options->icoUrl() ?>">
+<link rel="stylesheet" href="<?php $this->options->themeUrl('style.css'); ?>">
+<script src="<?php $this->options->themeUrl('script.js'); ?>"></script>
+<script src="<?php $this->options->themeUrl('tocbot.min.js'); ?>"></script>
+<?php $this->header("generator=&template=&pingback=&wlw=&xmlrpc=&rss1=&atom=&rss2=/feed"); ?>
+<?php $this->options->addhead(); ?>
+<?php $this->header(); ?> 
+</head>
+<body>
+<div class="wrapper">
 <header>
    <nav class="navbar">
         <div class="container">
diff --git a/index.php b/index.php
index 69746c8..0d839f8 100644
--- a/index.php
+++ b/index.php
@@ -1,15 +1,56 @@
-<?php
+<?php 
 /**
  * 移植自Hexo主题 Chic  
  * @package Chic
  * @author  老孙 
- * @version 0.1
+ * @version 0.2
  * @link https://imsun.org
  */
-if (!defined('__TYPECHO_ROOT_DIR__')) exit;
-$this->need('part/head.php');
+if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php $this->need('header.php'); ?>
+<div class="main">
+<div class="post-wrap archive">
+    <h2 class="post-title">-&nbsp; 文章列表 &nbsp;-</h2>
+<?php
+$previousYear = null;
+while($this->next()): 
+    $currentYear = date('Y', $this->created);
+    if ($previousYear !== $currentYear):
+        if ($previousYear !== null): ?>
+            </div> <!-- 关闭上一年的 div -->
+        <?php endif; ?>
+        <h3><?php echo $currentYear; ?></h3>
+        <div class="archive-year">
+    <?php 
+        $previousYear = $currentYear;
+    endif;
 ?>
-<div class="wrapper">
-<?php $this->need('part/header.php'); ?>
-<?php $this->need('part/profile.php'); ?>
-<?php $this->need('part/footer.php'); ?>
\ No newline at end of file
+    <article class="archive-item">
+        <a class="archive-item-link" href="<?php $this->permalink() ?>"><?php $this->title() ?></a>
+        <span class="archive-item-date"><?php $this->date('Y-m-d'); ?></span>
+    </article>
+<?php endwhile; ?>
+
+<?php if ($previousYear !== null): ?>
+    </div> <!-- 关闭最后一年的 div -->
+<?php endif; ?>   
+</div>
+<?php
+            $this->pagenav(
+                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10.8284 12.0007L15.7782 16.9504L14.364 18.3646L8 12.0007L14.364 5.63672L15.7782 7.05093L10.8284 12.0007Z" fill="var(--main)"></path></svg>',
+                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.1714 12.0007L8.22168 7.05093L9.63589 5.63672L15.9999 12.0007L9.63589 18.3646L8.22168 16.9504L13.1714 12.0007Z" fill="var(--main)"></path></svg>',
+                1,
+                '...',
+                array(
+                    'wrapTag' => 'div',
+                    'wrapClass' => 'pagination_page',
+                    'itemTag' => '',
+                    'textTag' => 'a',
+                    'currentClass' => 'active',
+                    'prevClass' => 'prev',
+                    'nextClass' => 'next'
+                )
+            );
+        ?>   
+</div>  
+<?php $this->need('footer.php'); ?>
\ No newline at end of file
diff --git a/page-archives.php b/page-archives.php
index 34ffe7d..7345691 100644
--- a/page-archives.php
+++ b/page-archives.php
@@ -5,9 +5,7 @@
  * @package custom
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php $this->need('part/head.php'); ?>
-<div class="wrapper">
-<?php $this->need('part/header.php'); ?>
+<?php $this->need('header.php'); ?>
 <div class="main">
 <div class="post-wrap archive">
     <h2 class="post-title">-&nbsp;&nbsp;<?php $this->title() ?>&nbsp;&nbsp;-</h2>
@@ -48,5 +46,5 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 </div>
 <br>  
 
-<?php $this->need('part/footer.php'); ?>
+<?php $this->need('footer.php'); ?>
  
\ No newline at end of file
diff --git a/page-categories.php b/page-categories.php
index df962e4..4948a22 100644
--- a/page-categories.php
+++ b/page-categories.php
@@ -5,9 +5,7 @@
  * @package custom
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php $this->need('part/head.php'); ?>
-<div class="wrapper">
-<?php $this->need('part/header.php'); ?>
+<?php $this->need('header.php'); ?>
 <div class="main">
 <div class="container">
 <div class="post-wrap categories">
@@ -47,5 +45,5 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 </div>
 </div>
   
-<?php $this->need('part/footer.php'); ?>
+<?php $this->need('footer.php'); ?>
  
\ No newline at end of file
diff --git a/part/sns.php b/page-home.php
similarity index 94%
rename from part/sns.php
rename to page-home.php
index a6fbe9f..6abb8eb 100644
--- a/part/sns.php
+++ b/page-home.php
@@ -1,4 +1,19 @@
+<?php
+/**
+ * 引导页
+ *
+ * @package custom
+ */
+if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php $this->need('header.php'); ?>
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<div class="main">
+    <div class="container profile-container">
+        <div class="intro">
+            <div class="avatar"><a href="/"> <img src="<?php $this->options->logoUrl() ?>"></a></div>
+            <div class="nickname"> <?php $this->author(); ?></div>
+            <div class="description"><p><?php $this->options->description() ?></p></div>
+            <div class="links">
 <a href="/feed" class="link-item" target="_blank">
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="32" height="32" fill="currentColor"><path d="M3 17C5.20914 17 7 18.7909 7 21H3V17ZM3 10C9.07513 10 14 14.9249 14 21H12C12 16.0294 7.97056 12 3 12V10ZM3 3C12.9411 3 21 11.0589 21 21H19C19 12.1634 11.8366 5 3 5V3Z"></path></svg>
 </a>
@@ -26,4 +41,9 @@
 <a class="link-item" href="<?php $this->options->mastodonurl() ?>" target="_blank">
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="32" height="32" fill="currentColor"><path d="M3.019 12.0075C2.98744 10.7478 3.00692 9.5598 3.00692 8.56644C3.00692 4.22767 5.84954 2.95597 5.84954 2.95597C7.28286 2.29767 9.74238 2.0209 12.2993 2H12.3621C14.919 2.0209 17.3801 2.29767 18.8134 2.95597C18.8134 2.95597 21.656 4.22767 21.656 8.56644C21.656 8.56644 21.6916 11.7674 21.2596 13.9898C20.9852 15.4007 18.8034 16.9446 16.2974 17.2438C14.9906 17.3999 13.7042 17.5431 12.3322 17.4802C10.0885 17.3775 8.31815 16.9446 8.31815 16.9446C8.31815 17.1631 8.33166 17.3711 8.35853 17.5655C8.44182 18.1978 8.65659 18.6604 8.96296 19C9.72944 19.8497 11.0692 19.9301 12.3577 19.9743C14.178 20.0366 15.7986 19.5254 15.7986 19.5254L15.8735 21.1712C15.8735 21.1712 14.6003 21.8548 12.3322 21.9805C11.0815 22.0493 9.52858 21.9491 7.71969 21.4704C6.18802 21.065 5.15153 20.1804 4.45091 19C3.35714 17.1573 3.08191 14.5938 3.019 12.0075ZM6.31815 16.9446V14.3967L8.79316 15.0018C8.8405 15.0134 8.95098 15.0383 9.11692 15.0723C9.40521 15.1313 9.73416 15.1908 10.0959 15.2467C10.8485 15.3628 11.6341 15.4462 12.4237 15.4823C13.4425 15.529 14.3249 15.4652 16.0603 15.2579C17.7233 15.0594 19.208 14.0622 19.2963 13.6082C19.3783 13.1861 19.4472 12.6858 19.5021 12.1261C19.5714 11.4205 19.6155 10.6558 19.6388 9.88068C19.654 9.37026 19.6582 8.93648 19.6564 8.62452L19.656 8.56644C19.656 7.1368 19.2873 6.12756 18.6928 5.40793C18.5008 5.17553 18.3004 4.99408 18.1087 4.85958C18.0183 4.79617 17.9737 4.77136 17.9787 4.77345C16.9662 4.30844 14.8859 4.02069 12.3621 3.99993H12.3156C9.77596 4.02069 7.6969 4.30836 6.66627 4.78161C6.68919 4.77136 6.64459 4.79617 6.55423 4.85958C6.36257 4.99408 6.16214 5.17553 5.97016 5.40793C5.37568 6.12756 5.00692 7.1368 5.00692 8.56644C5.00692 8.7976 5.00628 8.96339 5.00392 9.44137C4.9981 10.6238 5.00004 11.2256 5.01841 11.9589C5.07185 14.156 5.2822 15.7941 5.71797 17C5.93023 17.5874 6.19005 18.0709 6.49741 18.4507C6.37791 18.0162 6.31815 17.5142 6.31815 16.9446ZM8.08576 6.37135C8.71735 6.37135 9.22924 6.88324 9.22924 7.51482C9.22924 8.14626 8.71735 8.6583 8.08576 8.6583C7.45432 8.6583 6.94229 8.14626 6.94229 7.51482C6.94229 6.88324 7.45432 6.37135 8.08576 6.37135Z"></path></svg>
 </a>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
+            </div>
+        </div>
+    </div>
+</div>
+<?php $this->need('footer.php'); ?>
\ No newline at end of file
diff --git a/page-links.php b/page-links.php
index 4389bbc..19b2e2f 100644
--- a/page-links.php
+++ b/page-links.php
@@ -5,9 +5,7 @@
  * @package custom
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php $this->need('part/head.php');?>
-<div class="wrapper">
-<?php $this->need('part/header.php'); ?>
+<?php $this->need('header.php'); ?>
 <div class="main">
 <div class="container">
     <article class="post-wrap page">
@@ -42,7 +40,7 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
     </div>   
     </article>
 </div></div>
-<?php $this->need('part/footer.php'); ?>
+<?php $this->need('footer.php'); ?>
 <style>
 #links {
   padding-left: 3.5em;
diff --git a/page-tags.php b/page-tags.php
index ec17020..5746473 100644
--- a/page-tags.php
+++ b/page-tags.php
@@ -5,9 +5,7 @@
  * @package custom
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php $this->need('part/head.php'); ?>
-<div class="wrapper">
-<?php $this->need('part/header.php'); ?>
+<?php $this->need('header.php'); ?>
 <div class="main">
 <div class="container">
 <div class="post-wrap tags">
@@ -23,4 +21,4 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
                             <p class="text-center pb-2"><?php _e('没有任何标签'); ?></p>
                         <?php endif; ?>
 </div></div></div>
-<?php $this->need('part/footer.php'); ?>
\ No newline at end of file
+<?php $this->need('footer.php'); ?>
\ No newline at end of file
diff --git a/page.php b/page.php
index 6d51577..0cefbc3 100644
--- a/page.php
+++ b/page.php
@@ -1,7 +1,5 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php $this->need('part/head.php');?>
-<div class="wrapper">
-<?php $this->need('part/header.php'); ?>
+<?php $this->need('header.php'); ?>
 <div class="main">
 <div class="container">
     <article class="post-wrap page">
@@ -23,5 +21,5 @@
     </div>   
     </article>
 </div></div>
-<?php $this->need('part/footer.php'); ?>
+<?php $this->need('footer.php'); ?>
  
\ No newline at end of file
diff --git a/part/head.php b/part/head.php
deleted file mode 100644
index c731362..0000000
--- a/part/head.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-<meta http-equiv="X-UA-Compatible" content="ie=edge">
-<meta name="author" content="<?php $this->options->author() ?>">
-<meta name="description" content="<?php $this->options->description() ?>">
-<meta name="keywords" content="<?php $this->options->keywords() ?>">
-<title>
-    <?php if($this->_currentPage>1) echo '第 '.$this->_currentPage.' 页 - '; ?><?php $this->archiveTitle(array(
-            'category'  =>  _t('分类 %s 下的文章'),
-            'search'    =>  _t('包含关键字 %s 的文章'),
-            'tag'       =>  _t('标签 %s 下的文章'),
-            'date'      =>  _t('在<span> %s </span>发布的文章'),
-            'author'    =>  _t('%s 发布的文章')
-        ), '', ' - '); ?><?php if ($this->is('post')) $this->category(',', false);?><?php if ($this->is('post')) echo ' - ';?><?php $this->options->title(); ?><?php if ($this->is('index')) echo ' - '; ?><?php if ($this->is('index')) $this->options->description() ?>
-</title>
-<link rel="icon" href="<?php $this->options->icoUrl() ?>">
-<link rel="stylesheet" href="<?php $this->options->themeUrl('/dist/css/style.css'); ?>">
-<script src="<?php $this->options->themeUrl('/dist/js/script.js'); ?>"></script>
-<script src="<?php $this->options->themeUrl('/dist/js/tocbot.min.js'); ?>"></script>
-<?php $this->header("generator=&template=&pingback=&wlw=&xmlrpc=&rss1=&atom=&rss2=/feed"); ?>
-<?php $this->options->addhead(); ?>
-<?php $this->header(); ?> 
-</head>
-<body>
\ No newline at end of file
diff --git a/part/paginator.php b/part/paginator.php
deleted file mode 100644
index eeb1878..0000000
--- a/part/paginator.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
- 
-    <nav class="pagination">
- 
-    </nav>
- 
-<?php
-            $this->pagenav(
-                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10.8284 12.0007L15.7782 16.9504L14.364 18.3646L8 12.0007L14.364 5.63672L15.7782 7.05093L10.8284 12.0007Z" fill="var(--main)"></path></svg>',
-                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.1714 12.0007L8.22168 7.05093L9.63589 5.63672L15.9999 12.0007L9.63589 18.3646L8.22168 16.9504L13.1714 12.0007Z" fill="var(--main)"></path></svg>',
-                1,
-                '...',
-                array(
-                    'wrapTag' => 'div',
-                    'wrapClass' => 'pagination_page',
-                    'itemTag' => '',
-                    'textTag' => 'a',
-                    'currentClass' => 'active',
-                    'prevClass' => 'prev',
-                    'nextClass' => 'next'
-                )
-            );
-        ?>   
-        <!-- 搜索结果 --> 
-
-
-         
-<style>
-/* 分页 */
-.pagination_page{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-top: var(--margin);
-    gap: 0.5rem;
-}
-.pagination_page li.active a {
-    background: var(--theme);
-    color: #fff;
-    font-weight: 500;
-}
-.pagination_page a{
-    display: flex;
-    padding: 0.5rem;
-    font-size: 0.9rem;
-    width: 1.75rem;
-    height: 1.75rem;
-    background: var(--background);
-    border-radius: 50%;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    transition: 0.2s;
-    -webkit-transition: 0.2s;
-    justify-content: center;
-    align-items: center;
-    letter-spacing: 0;
-}
-.pagination_page span.next{
-    cursor: pointer;
-}
-.pagination_page li.active a:hover{
-    cursor: not-allowed;
-}
-/* 分页 */
-</style>
\ No newline at end of file
diff --git a/part/profile.php b/part/profile.php
deleted file mode 100644
index 1d5274f..0000000
--- a/part/profile.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<div class="main">
-    <div class="container profile-container">
-        <div class="intro">
-            <div class="avatar"><a href="/"> <img src="<?php $this->options->logoUrl() ?>"></a></div>
-            <div class="nickname"> <?php $this->author(); ?></div>
-            <div class="description"><p><?php $this->options->description() ?></p></div>
-            <div class="links"><?php $this->need('part/sns.php'); ?></div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/post.php b/post.php
index b6885a3..d5e5657 100644
--- a/post.php
+++ b/post.php
@@ -1,7 +1,5 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php $this->need('part/head.php'); ?>
-<div class="wrapper">
-<?php $this->need('part/header.php'); ?>
+<?php $this->need('header.php'); ?>
 <div class="main">
 <div class="container">
     <article class="post-wrap">
@@ -74,7 +72,7 @@
     </div>
     </div>  
     <?php if ($this->options->showtoc): ?>
-        <?php $this->need('part/toc.php'); ?>
+        <?php $this->need('toc.php'); ?>
 <?php endif; ?>
-<?php $this->need('part/footer.php'); ?>
+<?php $this->need('footer.php'); ?>
 
diff --git a/dist/js/script.js b/script.js
similarity index 100%
rename from dist/js/script.js
rename to script.js
diff --git a/dist/css/style.css b/style.css
similarity index 82%
rename from dist/css/style.css
rename to style.css
index 35c2421..59d451a 100644
--- a/dist/css/style.css
+++ b/style.css
@@ -1192,4 +1192,356 @@ html {
   .highlight .code .type,
   .highlight .code .selector-id {
     font-weight: bold;
-  }
\ No newline at end of file
+  }
+  .pagination_page{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: var(--margin);
+    gap: 0.5rem;
+}
+.pagination_page li.active a {
+    background: var(--theme);
+    color: #fff;
+    font-weight: 500;
+}
+.pagination_page a{
+    display: flex;
+    padding: 0.5rem;
+    font-size: 0.9rem;
+    width: 1.75rem;
+    height: 1.75rem;
+    background: var(--background);
+    border-radius: 50%;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    transition: 0.2s;
+    -webkit-transition: 0.2s;
+    justify-content: center;
+    align-items: center;
+    letter-spacing: 0;
+}
+.pagination_page span.next{
+    cursor: pointer;
+}
+.pagination_page li.active a:hover{
+    cursor: not-allowed;
+}
+.comment-form label {
+  display: block;
+  margin-bottom: .5rem;
+  font-size: 14px;
+  cursor: pointer;
+  line-height: 1.4
+}
+
+.comment-form label .required {
+  color: red
+}
+
+.comment-form input,
+.comment-form textarea {
+  width: 100%;
+  resize: none;
+  border-radius: 5px;
+  box-sizing: border-box;
+  border: 1px solid #999;
+  padding: 8px 15px;
+  font-size: 14px
+}
+
+.comment-form .submit {
+  background-color: #000;
+  color: #fff;
+  border: 0;
+  font-size: 14px;
+  cursor: pointer;
+  padding: 8px 30px;
+  border-radius: 5px;
+  width: auto
+}
+
+.comment-form .submit:hover {
+  background-color: var(--farallon-text-light)
+}
+
+.comment-form p {
+  margin-bottom: 15px
+}
+
+.comment-form p:last-of-type {
+  margin-bottom: 0
+}
+
+.comment-form .comment-notes,
+.comment-form .logged-in-as {
+  font-size: 12px;
+  color: var(--farallon-text-gray)
+}
+
+.comment-reply-title {
+  font-weight: 700;
+  font-size: 18px;
+  display: flex;
+  align-items: center
+}
+
+.comment-reply-title small {
+  margin-left: auto;
+  font-weight: 400;
+  font-size: 14px
+}
+
+.commentlist {
+  border-top: 1px solid var(--farallon-border-color-light);
+  list-style: none;
+  padding-top: 10px
+}
+
+.commentlist .comment {
+  padding: 0 0
+}
+
+.commentlist .comment-respond {
+  margin-top: 20px;
+  padding: 20px;
+  background-color: var(--farallon-background-gray);
+  border-radius: 5px
+}
+
+@keyframes comment--fresh {
+  0% {
+      background-color: #fff
+  }
+
+  100% {
+      background-color: #fffee0
+  }
+}
+
+.comment:last-child>.comment-body {
+  border-bottom: 0
+}
+
+.comment.parent {
+  border-bottom: 1px solid var(--farallon-border-color-light)
+}
+
+.comment.parent:last-child {
+  border-bottom: 0
+}
+
+.comment-body {
+  padding: 25px 0
+}
+
+.comment-body__fresh {
+  animation: comment--fresh 1.5s ease-in-out infinite alternate;
+  border-radius: 5px
+}
+
+.comment-body .avatar {
+  transition: .5s box-shadow
+}
+
+.comment-body:hover .avatar {
+  box-shadow: 0 0 3px 0 var(--farallon-hover-color)
+}
+
+.comment--avatar {
+  flex: none;
+  margin-right: 10px;
+  display: flex
+}
+
+.comment--author {
+  flex: auto;
+  display: flex;
+  align-items: center
+}
+
+.comment--author .comment-reply-link {
+  margin-left: auto
+}
+
+.comment--author .comment-reply-link svg {
+  fill: var(--farallon-text-gray);
+  width: 15px;
+  height: 15px
+}
+
+.comment--author .comment-reply-link:hover svg {
+  fill: var(--farallon-hover-color)
+}
+
+.comment--author a {
+  color: var(--farallon-main-color)
+}
+
+.comment--author a:hover {
+  color: var(--farallon-hover-color);
+  text-decoration: underline
+}
+
+.comment--meta {
+  display: flex;
+  align-items: center;
+  flex: auto
+}
+
+.comment--time {
+  color: var(--farallon-text-light)
+}
+
+.comment-meta {
+  display: flex;
+  align-items: center
+}
+
+.comment-meta .avatar {
+  border-radius: 100%
+}
+
+
+div.cancel-comment-reply.cancel-comment-reply-link {
+  text-align: right;
+}
+
+.comment-content {
+  word-wrap: break-word !important;
+  overflow-wrap: break-word !important;
+  white-space: normal !important;
+  color: var(--farallon-text-light)
+}
+
+.comment-content a {
+  text-decoration: underline
+}
+
+.comment-content a:hover {
+  color: var(--farallon-hover-color)
+}
+
+.children {
+  margin-left: 0;
+  padding-bottom: 10px
+}
+
+.children .avatar {
+  width: 32px;
+  height: 32px
+}
+
+.children .comment-body {
+  border-bottom: 0;
+  padding: 15px 0
+}
+
+.children .comment-content {
+  font-size: 14px
+}
+
+.parent>.children {
+  margin-left: 50px
+}
+
+.comment-meta {
+  margin-bottom: 10px;
+  font-size: 14px;
+  display: flex;
+  align-items: center
+}
+
+.comment-meta .comment-metadata {
+  margin-left: auto
+}
+
+.comment-reply-link {
+  font-size: 12px
+}
+
+.no--comment {
+  text-align: center;
+  padding: 30px 0
+}
+
+.comments--title {
+  margin-top: 30px;
+  font-size: 18px;
+  font-weight: 700;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center
+}
+
+.comments--title svg {
+  width: 24px;
+  height: 24px;
+  margin-right: 5px;
+  position: relative;
+  transform: translate3d(0, 1px, 0);
+  fill: var(--farallon-text-color)
+}
+
+.comment-respond {
+  padding-top: 30px
+}
+
+.comment-form-cookies-consent #wp-comment-cookies-consent {
+  display: none
+}
+
+.comment-form-cookies-consent label {
+  font-size: 14px;
+  color: var(--farallon-text-gray);
+  display: flex;
+  align-items: center;
+  position: relative
+}
+
+.comment-form-cookies-consent label::before {
+  background-color: #fff;
+  border: 1px solid rgba(0, 0, 0, .15);
+  border-radius: 100%;
+  height: 16px;
+  margin-right: 6px;
+  vertical-align: middle;
+  width: 16px;
+  content: "";
+  flex: none
+}
+.dot::before {
+  content: "·";
+  margin-left: 4px;
+  margin-right: 4px
+}
+
+.comment-form-cookies-consent input:checked+label::after {
+  background-color: var(--farallon-main-color);
+  border-radius: 100%;
+  content: "";
+  position: absolute;
+  left: 1px;
+  height: 12px;
+  margin: 2px;
+  width: 12px;
+  flex: none
+}
+/* 去除有序列表（<ol>）的列表号 */
+ol.comment-list {
+  list-style-type: none;
+  padding-left: 0; /* 取消左侧的默认填充 */
+}
+
+/* 去除无序列表（<ul>）的列表号 */
+ul.comment-list {
+  list-style-type: none;
+  padding-left: 0; /* 取消左侧的默认填充 */
+}
+
+/* 适用于所有嵌套的评论列表 */
+ol.comment-list li, ul.comment-list li {
+  list-style-type: none;
+}
\ No newline at end of file
diff --git a/part/toc.php b/toc.php
similarity index 100%
rename from part/toc.php
rename to toc.php
diff --git a/dist/js/tocbot.min.js b/tocbot.min.js
similarity index 100%
rename from dist/js/tocbot.min.js
rename to tocbot.min.js