Update: 调整 layout 和 source/css 目录结构,使其更合理

This commit is contained in:
XPoet 2020-03-21 11:18:52 +08:00
parent 0c8ac5f2ed
commit 5e22aa8b8e
29 changed files with 83 additions and 29 deletions

View File

@ -25,3 +25,59 @@ valine:
notify: false # mail notifier , https://github.com/xCss/Valine/wiki notify: false # mail notifier , https://github.com/xCss/Valine/wiki
verify: false # Verification code verify: false # Verification code
placeholder: 评论一下再走吧~ placeholder: 评论一下再走吧~
# ---------------------------------------------------------------
# Font Settings
# - Find fonts on Google Fonts (https://www.google.com/fonts)
# - All fonts set here will have the following styles:
# light, light italic, normal, normal italic, bold, bold italic
# - Be aware that setting too much fonts will cause site running slowly
# - Introduce in 5.0.1
# ---------------------------------------------------------------
# CAUTION! Safari Version 10.1.2 bug: https://github.com/iissnan/hexo-theme-next/issues/1844
# To avoid space between header and sidebar in Pisces / Gemini themes recommended to use Web Safe fonts for `global` (and `logo`):
# Arial | Tahoma | Helvetica | Times New Roman | Courier New | Verdana | Georgia | Palatino | Garamond | Comic Sans MS | Trebuchet MS
# ---------------------------------------------------------------
font:
enable: false
# Uri of fonts host. E.g. //fonts.googleapis.com (Default).
host:
# Font options:
# `external: true` will load this font family from `host` above.
# `family: Times New Roman`. Without any quotes.
# `size: xx`. Use `px` as unit.
# Global font settings used on <body> element.
global:
external: true
family: Lato
size:
# Font settings for Headlines (h1, h2, h3, h4, h5, h6).
# Fallback to `global` font settings.
headings:
external: true
family:
size:
# Font settings for posts.
# Fallback to `global` font settings.
posts:
external: true
family:
# Font settings for Logo.
# Fallback to `global` font settings.
logo:
external: true
family:
size:
# Font settings for <code> and code blocks.
codes:
external: true
family: Source Code Pro
size: 14

View File

@ -5,7 +5,7 @@
</div> </div>
<div class="about-comments"> <div class="about-comments">
<%if (page.comments) {%> <%if (page.comments) {%>
<%- partial('valine') %> <%- partial('common/valine') %>
<%}%> <%}%>
</div> </div>
</div> </div>

View File

@ -7,7 +7,7 @@
</div> </div>
<div class="article-meta-info"> <div class="article-meta-info">
<%- partial('article-meta-info', {articleData: page, index: true}) %> <%- partial('common/article-meta-info', {articleData: page, index: true}) %>
</div> </div>
<div class="article-content"> <div class="article-content">
@ -30,7 +30,7 @@
<% } %> <% } %>
</div> </div>
<div class="comment-container"> <div class="comment-container">
<%- partial('valine') %> <%- partial('common/valine') %>
</div> </div>
</div> </div>

View File

@ -1,6 +1,6 @@
<div class="left-side-container"> <div class="left-side-container">
<div class="site-info-container"> <div class="site-info-container">
<%- partial('common/site-info') %> <%- partial('site-info') %>
</div> </div>
<div class="footer-container"> <div class="footer-container">
<%- partial('footer') %> <%- partial('footer') %>

View File

@ -16,7 +16,7 @@
</div> </div>
<div class="article-meta-info-container"> <div class="article-meta-info-container">
<%- partial('article-meta-info', {articleData: post, index: true}) %> <%- partial('common/article-meta-info', {articleData: post, index: true}) %>
</div> </div>
</li> </li>
<% }) %> <% }) %>

View File

@ -5,6 +5,6 @@
<body> <body>
<!-- body 表示可以显示其他页面内容(归档页面等等)--> <!-- body 表示可以显示其他页面内容(归档页面等等)-->
<%- body %> <%- body %>
<%- partial('scripts') %> <%- partial('common/scripts') %>
</body> </body>
</html> </html>

View File

@ -1,7 +1,7 @@
<!-- 通用页面模板 --> <!-- 通用页面模板 -->
<div class="page-container"> <div class="page-container">
<div class="page-left animated"> <div class="page-left animated">
<%- partial('left-side') %> <%- partial('common/left-side') %>
</div> </div>
<div class="page-right"> <div class="page-right">
<%- partial('right-side') %> <%- partial('right-side') %>

View File

@ -1,2 +0,0 @@
<!-- 文章页面 -->
<%- partial('page') %>

View File

@ -5,27 +5,27 @@
<div class="article-post-container animated"> <div class="article-post-container animated">
<% if (is_home()) { %> <% if (is_home()) { %>
<!-- 载入首页的内容 --> <!-- 载入首页的内容 -->
<%- partial('common/home-post') %> <%- partial('home-post') %>
<% } else if (is_archive()) { %> <% } else if (is_archive()) { %>
<!-- 载入归档页面的内容 --> <!-- 载入归档页面的内容 -->
<%- partial('common/archive-post') %> <%- partial('archive-post') %>
<% } else if (is_post()) { %> <% } else if (is_post()) { %>
<!-- 载入文章页面的内容 --> <!-- 载入文章页面的内容 -->
<%- partial('common/article-post') %> <%- partial('article-post') %>
<% } else if (is_category()) { %> <% } else if (is_category()) { %>
<!-- 载入分类页面的内容 --> <!-- 载入分类页面的内容 -->
<%- partial('common/category-post') %> <%- partial('category-post') %>
<% } else if (is_tag()) { %> <% } else if (is_tag()) { %>
<!-- 载入标签页面的内容 --> <!-- 载入标签页面的内容 -->
<%- partial('common/tag-post') %> <%- partial('tag-post') %>
<% } else if (page.title == 'about') { %> <% } else if (page.title == 'about') { %>
<!-- 载入关于页面的内容 --> <!-- 载入关于页面的内容 -->
<%- partial('common/about') %> <%- partial('about') %>
<% } %> <% } %>
</div> </div>
</div> </div>

View File

@ -1,17 +1,17 @@
@import "libs/font-awesome.min.css" @import "libs/font-awesome.min.css"
@import "basic.styl" @import "basic.styl"
@import "animated.styl" @import "animated.styl"
@import "index.styl" @import "layout/index.styl"
@import "left-side.styl" @import "layout/right-side.styl"
@import "right-side.styl" @import "layout/common/left-side.styl"
@import "footer.styl" @import "layout/common/footer.styl"
@import "common/nav.styl" @import "layout/common/nav.styl"
@import "common/home-post.styl" @import "layout/home-post.styl"
@import "common/archive-post.styl" @import "layout/archive-post.styl"
@import "common/article-post.styl" @import "layout/article-post.styl"
@import "common/article-meta-info.styl" @import "layout/common/article-meta-info.styl"
@import "common/category-post.styl" @import "layout/category-post.styl"
@import "common/tag-post.styl" @import "layout/tag-post.styl"
@import "common/site-info.styl" @import "layout/common/site-info.styl"
@import "highlight" @import "highlight"
@import "variables.styl" @import "variables.styl"

View File

@ -1,4 +1,4 @@
// // =================================================
// Variables // Variables
// ================================================= // =================================================