Merge pull request #19 from EvanNotFound/dev

v0.3.5
EvanNotFound · Dec 11, 2022 · ec85da2 · ec85da2
2 parents f3c1110 + 8f3bb82
commit ec85da2
Show file tree

Hide file tree

Showing 22 changed files with 375 additions and 380 deletions.
diff --git a/README.md b/README.md
@@ -21,11 +21,13 @@
 
 ## 📷 Screenshots
 
-<img width="1420" alt="Screen Shot 2022-11-11 at 8 55 39 PM" src="https://user-images.githubusercontent.com/68590232/201453764-75276390-8888-4c0f-9ccc-497cede23e00.png">
+![redefine-rendered-1](https://user-images.githubusercontent.com/68590232/206929384-70de96a9-71ce-415b-af72-0ccebddd0d5c.png)
 
-<img width="1428" alt="Screen Shot 2022-11-11 at 8 56 03 PM" src="https://user-images.githubusercontent.com/68590232/201453766-361b2dda-3ef9-4464-acde-42895af192a0.png">
+![redefine-rendered-2](https://user-images.githubusercontent.com/68590232/206929386-93ca5470-6fc3-4f6d-a7a1-9cb6a182b0f6.png)
+
+
+![redefine-rendered-3](https://user-images.githubusercontent.com/68590232/206929149-f2ac77cc-c309-4d9e-a87a-bf13f4a4419c.png)
 
-<img width="1428" alt="Screen Shot 2022-11-11 at 8 56 25 PM" src="https://user-images.githubusercontent.com/68590232/201453768-6b3a3a2e-5d2a-4683-b207-bc08ce55812c.png">
 
 
 ## 🌐 Online Demo
@@ -89,13 +91,7 @@ Feel free to **pull request** and **send issues**.
 
 If you have any questions, please send an email to [[email protected]](mailto:[email protected]). I will reply in time.
 
-
-
-If you don't want to donate, you can still leave a comment on [my blog](https://www.evanluo.top) or **give me a star**.
-
-If, yes if, you think that this theme is pretty good, why not buy me a cup of coffee? Thanks.
-
-<img src="https://user-images.githubusercontent.com/68590232/195916630-2785ca44-1199-45c6-8b57-1472ec3c6906.JPG" referrerpolicy="no-referrer" alt="IMG_7991" style="zoom:30%">
+Please **give me a star** to support me, thanks!
 
 
 
diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -19,11 +19,12 @@
 
 ## 📷 屏幕截图
 
-<img width="1420" alt="Screen Shot 2022-11-11 at 8 55 39 PM" src="https://user-images.githubusercontent.com/68590232/201453764-75276390-8888-4c0f-9ccc-497cede23e00.png">
+![redefine-rendered-1](https://user-images.githubusercontent.com/68590232/206929384-70de96a9-71ce-415b-af72-0ccebddd0d5c.png)
 
-<img width="1428" alt="Screen Shot 2022-11-11 at 8 56 03 PM" src="https://user-images.githubusercontent.com/68590232/201453766-361b2dda-3ef9-4464-acde-42895af192a0.png">
+![redefine-rendered-2](https://user-images.githubusercontent.com/68590232/206929386-93ca5470-6fc3-4f6d-a7a1-9cb6a182b0f6.png)
 
-<img width="1428" alt="Screen Shot 2022-11-11 at 8 56 25 PM" src="https://user-images.githubusercontent.com/68590232/201453768-6b3a3a2e-5d2a-4683-b207-bc08ce55812c.png">
+
+![redefine-rendered-3](https://user-images.githubusercontent.com/68590232/206929149-f2ac77cc-c309-4d9e-a87a-bf13f4a4419c.png)
 
 
 ## 🌐 在线演示站
@@ -103,9 +104,5 @@ $ git clone https://github.com/EvanNotFound/hexo-theme-redefine.git themes/redef
 
 如果我做的主题还不错的话，欢迎给我 Github 点个 Star，谢谢
 
-或者，给我买一杯咖啡？
-
-<img src="https://user-images.githubusercontent.com/68590232/195916630-2785ca44-1199-45c6-8b57-1472ec3c6906.JPG" referrerpolicy="no-referrer" alt="IMG_7991" style="zoom:30%">
-
 
 
diff --git a/README_zh-TW.md b/README_zh-TW.md
@@ -19,11 +19,12 @@
 
 ## 📷 屏幕截圖
 
-<img width="1420" alt="Screen Shot 2022-11-11 at 8 55 39 PM" src="https://user-images.githubusercontent.com/68590232/201453764-75276390-8888-4c0f-9ccc-497cede23e00.png">
+![redefine-rendered-1](https://user-images.githubusercontent.com/68590232/206929384-70de96a9-71ce-415b-af72-0ccebddd0d5c.png)
 
-<img width="1428" alt="Screen Shot 2022-11-11 at 8 56 03 PM" src="https://user-images.githubusercontent.com/68590232/201453766-361b2dda-3ef9-4464-acde-42895af192a0.png">
+![redefine-rendered-2](https://user-images.githubusercontent.com/68590232/206929386-93ca5470-6fc3-4f6d-a7a1-9cb6a182b0f6.png)
 
-<img width="1428" alt="Screen Shot 2022-11-11 at 8 56 25 PM" src="https://user-images.githubusercontent.com/68590232/201453768-6b3a3a2e-5d2a-4683-b207-bc08ce55812c.png">
+
+![redefine-rendered-3](https://user-images.githubusercontent.com/68590232/206929149-f2ac77cc-c309-4d9e-a87a-bf13f4a4419c.png)
 
 
 ## 🌐 在線演示站
@@ -105,7 +106,3 @@ $ git clone https://github.com/EvanNotFound/hexo-theme-redefine.git themes/redef
 如有問題，請發郵件到 [[email protected]](mailto:[email protected]). 我會及時回复
 
 如果我做的主題還不錯的話，歡迎給我 Github 點個 Star，謝謝
-
-或者，給我買一杯咖啡？
-
-<img src="https://user-images.githubusercontent.com/68590232/195916630-2785ca44-1199-45c6-8b57-1472ec3c6906.JPG" referrerpolicy="no-referrer" alt="IMG_7991" style="zoom:30%">
diff --git a/_config.yml b/_config.yml
@@ -25,10 +25,10 @@ style:
   article_img_align: center # value: left | center
 
   # Left side width
-  left_side_width: 240px #sidebar width, for toc
+  right_side_width: 210px #sidebar width, for toc
 
   # Content area max width
-  content_max_width: 960px #content max width, for article
+  content_max_width: 1000px #content max width, for article
 
   #navigation bar background color (from left to right)
   nav_color: 
@@ -45,11 +45,11 @@ style:
   first_screen:
     enable: true
     background_image:
-      light: /images/wallhaven-bg-light.webp # background image of the first screen, use relative path or external link (if your website is in subdirectory, use external link)
-      dark: /images/wallhaven-bg-dark.webp # background image of the first screen, use relative path or external link (if your website is in subdirectory, use external link)
+      light: https://evan.beee.top/img/wallhaven-wqery6-light.webp # background image of the first screen, use relative path or external link (if your website is in subdirectory, use external link)
+      dark: https://evan.beee.top/img/wallhaven-wqery6-dark.webp # background image of the first screen, use relative path or external link (if your website is in subdirectory, use external link)
     title_color:
       light: "#fff" # first screen title color (light mode)
-      dark: "#323739" # first screen title color (dark mode)
+      dark: "#d1d1b6" # first screen title color (dark mode)
     description: Theme Redefine # the title in the middle of the first screen. HTML supported (e.g. svg html code of your logo)
 
   # Scroll style settings
@@ -227,4 +227,4 @@ footer:
 # ---------------------------------------------------------------------------------------
 # Redefine Theme version (Please don't modify)
 # ---------------------------------------------------------------------------------------
-version: 0.3.4
+version: 0.3.5
diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs
@@ -35,4 +35,7 @@
                 提供CDN加速/云存储服务</a></div>
         <% } %>
     </div>
+    <link rel="stylesheet" href="//evan.beee.top/css/waline.css"/>
+    <script src="//evan.beee.top/js/waline.js"></script>
+    <%- __css('css/regular.min.css') %>
 </footer>
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -30,16 +30,11 @@
     <%- css('css/style') %>
     <%- favicon_tag(theme.style.favicon) %>
     <%- __css('css/fontawesome.min.css') %>
-    <%- __css('css/fontawesome.min.css') %>
-    <%- __css('css/regular.min.css') %>
     <%- __css('css/v5-font-face.min.css') %>
     <%- __css('css/duotone.min.css') %>
     <%- __css('css/brands.min.css') %>
     <%- __css('css/solid.min.css') %>
-    <%- __css('css/brands.min.css') %>
     <%- __css('css/css2.css') %>
-    <link rel="stylesheet" href="//evan.beee.top/css/waline.css"/>
-    <script src="//evan.beee.top/js/waline.js"></script>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <%- export_config() %>

diff --git a/layout/_partial/toc.ejs b/layout/_partial/toc.ejs
@@ -1,6 +1,6 @@
 <div class="post-toc-wrap">
     <div class="post-toc">
-        <div style="font-size: 1.3rem;margin-top: 0; margin-bottom: 0.8rem; transition-duration: 0.1s;"><i class="fa-solid fa-list-tree"></i> <strong><%- __('toc') %></strong></div>
+        <div style="font-size: 1.3rem;margin-top: 0; margin-bottom: 0.8rem; transition-duration: 0.1s;"><i class="fa-solid fa-list"></i> <strong><%- __('toc') %></strong></div>
         <%- toc(
                 page.content,
                 {

diff --git a/layout/article-content.ejs b/layout/article-content.ejs
@@ -1,95 +1,102 @@
 <div class="fade-in-down-animation">
-    <div class="article-content-container">
-
-        <div class="article-title">
-            <span class="title-hover-animation"><h1 style="font-size:2rem; font-weight: bold; margin: 10px 0;"><%= page.title %></h1></span>
-        </div>
+    <div class="post-page-container">
+        <div class="article-content-container">
+            <div class="article-title">
+                <span class="title-hover-animation"><h1 style="font-size:2rem; font-weight: bold; margin: 10px 0;"><%= page.title %></h1></span>
+            </div>
 
-        <% if (theme.base_info.author || config.author) { %>
-            <div class="article-header">
-                <div class="avatar">
-                    <%- image_tag(theme.style.avatar) %>
-                </div>
-                <div class="info">
-                    <div class="author">
-                        <span class="name"><%= theme.base_info.author || config.author %></span>
-                        <% if (theme.hasOwnProperty('post') && theme.post.author_label.enable === true) { %>
-                            <span class="author-label"><%- getAuthorLabel(site.posts.length, theme.post.author_label.auto, theme.post.author_label.custom_label_list) %></span>
-                        <% } %>
+            <% if (theme.base_info.author || config.author) { %>
+                <div class="article-header">
+                    <div class="avatar">
+                        <%- image_tag(theme.style.avatar) %>
+                    </div>
+                    <div class="info">
+                        <div class="author">
+                            <span class="name"><%= theme.base_info.author || config.author %></span>
+                            <% if (theme.hasOwnProperty('post') && theme.post.author_label.enable === true) { %>
+                                <span class="author-label"><%- getAuthorLabel(site.posts.length, theme.post.author_label.auto, theme.post.author_label.custom_label_list) %></span>
+                            <% } %>
+                        </div>
+                        <div class="meta-info">
+                            <%- partial('_partial/article-meta-info', {articleObject: page, index: true}) %>
+                        </div>
                     </div>
+                </div>
+            <% } else { %>
+                <div class="article-header-meta-info">
                     <div class="meta-info">
                         <%- partial('_partial/article-meta-info', {articleObject: page, index: true}) %>
                     </div>
                 </div>
+            <% } %>
+
+            <div class="article-content markdown-body">
+                <%- page.content %>
             </div>
-        <% } else { %>
-            <div class="article-header-meta-info">
-                <div class="meta-info">
-                    <%- partial('_partial/article-meta-info', {articleObject: page, index: true}) %>
-                </div>
-            </div>
-        <% } %>
 
-        <div class="article-content markdown-body">
-            <%- page.content %>
-        </div>
+            <% if (theme.copyright_info.enable) { %>
+                <div class="post-copyright-info">
+                    <%- partial('_partial/article-copyright-info') %>
+                </div>
+            <% } %>
 
-        <% if (theme.copyright_info.enable) { %>
-            <div class="post-copyright-info">
-                <%- partial('_partial/article-copyright-info') %>
-            </div>
-        <% } %>
+            <% if (page.tags.length) { %>
+                <ul class="post-tags-box">
+                    <% page.tags.forEach((tag) => { %>
+                        <li class="tag-item">
+                            <a href="<%- url_for(tag.path) %>">#<%= tag.name %></a>&nbsp;
+                        </li>
+                    <% }); %>
+                </ul>
+            <% } %>
 
-        <% if (page.tags.length) { %>
-            <ul class="post-tags-box">
-                <% page.tags.forEach((tag) => { %>
-                    <li class="tag-item">
-                        <a href="<%- url_for(tag.path) %>">#<%= tag.name %></a>&nbsp;
-                    </li>
-                <% }); %>
-            </ul>
-        <% } %>
+            <% if (page.prev || page.next) { %>
+                <div class="article-nav">
+                    <% if (page.prev) { %>
+                        <div class="article-prev">
+                            <a class="prev"
+                            rel="prev"
+                            href="<%= url_for(page.prev.path) %>"
+                            >
+                                <span class="left arrow-icon flex-center">
+                                <i class="fas fa-chevron-left"></i>
+                                </span>
+                                <span class="title flex-center">
+                                    <span class="post-nav-title-item"><%= page.prev.title %></span>
+                                    <span class="post-nav-item"><%= __('prev_posts') %></span>
+                                </span>
+                            </a>
+                        </div>
+                    <% } %>
+                    <% if (page.next) { %>
+                        <div class="article-next">
+                            <a class="next"
+                            rel="next"
+                            href="<%= url_for(page.next.path) %>"
+                            >
+                                <span class="title flex-center">
+                                    <span class="post-nav-title-item"><%= page.next.title %></span>
+                                    <span class="post-nav-item"><%= __('next_posts') %></span>
+                                </span>
+                                <span class="right arrow-icon flex-center">
+                                <i class="fas fa-chevron-right"></i>
+                                </span>
+                            </a>
+                        </div>
+                    <% } %>
+                </div>
+            <% } %>
 
-        <% if (page.prev || page.next) { %>
-            <div class="article-nav">
-                <% if (page.prev) { %>
-                    <div class="article-prev">
-                        <a class="prev"
-                           rel="prev"
-                           href="<%= url_for(page.prev.path) %>"
-                        >
-                            <span class="left arrow-icon flex-center">
-                              <i class="fas fa-chevron-left"></i>
-                            </span>
-                            <span class="title flex-center">
-                                <span class="post-nav-title-item"><%= page.prev.title %></span>
-                                <span class="post-nav-item"><%= __('prev_posts') %></span>
-                            </span>
-                        </a>
-                    </div>
-                <% } %>
-                <% if (page.next) { %>
-                    <div class="article-next">
-                        <a class="next"
-                           rel="next"
-                           href="<%= url_for(page.next.path) %>"
-                        >
-                            <span class="title flex-center">
-                                <span class="post-nav-title-item"><%= page.next.title %></span>
-                                <span class="post-nav-item"><%= __('next_posts') %></span>
-                            </span>
-                            <span class="right arrow-icon flex-center">
-                              <i class="fas fa-chevron-right"></i>
-                            </span>
-                        </a>
-                    </div>
-                <% } %>
-            </div>
-        <% } %>
+            <% if (theme.comment.enable === true && theme.comment.hasOwnProperty(theme.comment.use)) { %>
+                <div class="comment-container">
+                    <%- partial('_partial/comment/comment') %>
+                </div>
+            <% } %>
+        </div>
 
-        <% if (theme.comment.enable === true && theme.comment.hasOwnProperty(theme.comment.use)) { %>
-            <div class="comment-container">
-                <%- partial('_partial/comment/comment') %>
+        <% if (is_post() && theme.toc.enable === true) { %>
+            <div class="toc-content-container">
+                <%- partial('_partial/toc') %>
             </div>
         <% } %>
     </div>

diff --git a/layout/page.ejs b/layout/page.ejs
@@ -40,8 +40,11 @@
                     <%- partial('_partial/page-template') %>
 
                 <% } %>
+
             </div>
 
+
+
         </div>
 
         <div class="page-main-content-bottom">
@@ -59,12 +62,6 @@
         <%- partial('_partial/side-tools') %>
     </div>
 
-    <% if (is_post() && theme.toc.enable === true) { %>
-        <aside class="page-aside">
-            <%- partial('_partial/toc') %>
-        </aside>
-    <% } %>
-
     <%- partial('_partial/image-viewer') %>
 
     <% if (theme.local_search.enable) { %>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-redefine",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "private": false,
   "description": "\"Redefine\" hexo theme is a simple & fast & pure theme, but with no compromise.",
   "scripts": {

diff --git a/source/css/common/animated.styl b/source/css/common/animated.styl
@@ -38,6 +38,7 @@ transition-t(property, delay, duration, function) {
   animation-fill-mode both
   animation-duration 1s
   animation-name fade-in-down
+  will-change transform
 }
 
 

diff --git a/source/css/common/variables.styl b/source/css/common/variables.styl
@@ -17,7 +17,7 @@ $component-spacing-value = 38px;                                 // component-sp
 
 // main content max width
 $temp-content-max-width = hexo-config('style.content_max_width')
-$content-max-width = $temp-content-max-width ? convert($temp-content-max-width) : 1000px
+$content-max-width = $temp-content-max-width ? convert($temp-content-max-width) : 1200px
 
 
 // ========================================================================================

diff --git a/source/css/layout/_partial/first-screen.styl b/source/css/layout/_partial/first-screen.styl
@@ -7,8 +7,10 @@ $first-screen-icon-size = 1.6rem
   position relative
   box-sizing border-box
   width 100%
+  height: 1080px;
   overflow hidden
   background url($first-screen-img) center center / cover no-repeat
+  will-change: transform;