diff --git a/_config.yml b/_config.yml
index 86a04a6..cb6dbf5 100755
--- a/_config.yml
+++ b/_config.yml
@@ -47,7 +47,8 @@ loading_img: https://cdn.jsdelivr.net/gh/xaoxuu/assets@master/avatar/avatar.png
# 主页封面
home_cover:
- title: xaoxuu
+ title: "xaoxuu"
+ logo:
search_placeholder: 'la víspera de la tormenta'
# 主页封面菜单
menu:
@@ -62,7 +63,7 @@ home_cover:
url: https://xaoxuu.com/wiki/
- name: 归档
icon: fas fa-archive
- url: blog/archives/
+ url: archives/
- name: 关于
icon: fas fa-info-circle
url: about/
@@ -71,13 +72,13 @@ home_cover:
menu:
- name: Cocoa Dev
icon: fab fa-apple
- url: blog/categories/cocoa-dev/
+ url: categories/cocoa-dev/
- name: Dev
icon: fas fa-laptop-code
- url: blog/categories/dev/
+ url: categories/dev/
- name: Life
icon: fas fa-coffee
- url: blog/categories/life/
+ url: categories/life/
# 侧边栏小部件
@@ -95,7 +96,7 @@ sidebar:
url: https://xaoxuu.com/wiki/
- name: 文章归档
icon: fas fa-archive
- url: blog/archives/
+ url: archives/
- name: 我的友链
icon: fas fa-link
url: friends/
@@ -108,12 +109,12 @@ sidebar:
- widget: category
more:
icon: fas fa-expand-arrows-alt
- url: blog/categories/
+ url: categories/
- widget: tagcloud
icon: fas fa-fire
more:
icon: fas fa-expand-arrows-alt
- url: blog/tags/
+ url: tags/
- widget: related_posts
- widget: music
icon: fas fa-compact-disc
diff --git a/layout/category.ejs b/layout/category.ejs
index 6e5e43d..c5192b8 100755
--- a/layout/category.ejs
+++ b/layout/category.ejs
@@ -1,32 +1,37 @@
<% if (site.posts && site.posts.length > 0) { %>
-
+ <% if (page.index) { %>
+
+ <% } else { %>
+ <%- partial('_partial/archive') %>
+ <% } %>
<% } %>
+
<%- partial('_partial/side') %>
<%- partial('_partial/footer', null, {cache: !config.relative_link}) %>
diff --git a/layout/tag.ejs b/layout/tag.ejs
index 3d93ec4..8e1805b 100755
--- a/layout/tag.ejs
+++ b/layout/tag.ejs
@@ -1,33 +1,37 @@
<% if (site.posts && site.posts.length > 0) { %>
-
+ <% if (page.index) { %>
+
+ <% } else { %>
+ <%- partial('_partial/archive') %>
+ <% } %>
<% } %>
<%- partial('_partial/side') %>
diff --git a/source/less/_base.less b/source/less/_base.less
index 124e24b..64883cf 100755
--- a/source/less/_base.less
+++ b/source/less/_base.less
@@ -59,11 +59,11 @@ body {
padding: @gap;
.title{
font-size: @fontsize_h1*2;
- margin-top: 25vh;
+ margin-top: 30vh;
align-self: center;
}
.m_search{
- margin-top: 10vh;
+ margin-top: 5vh;
position: relative;
height: @height_navbar - @gap;
width: 1.2*@width_sidebar;
@@ -150,21 +150,14 @@ body {
}
ul > li > a{
font-size: @fontsize_small;
- padding: 0 2px;
+ padding: 2px;
margin: 0 4px;
.enable-trans();
color: fade(@color_text_main, 70%);
- border-bottom: @loading_height solid transparent;
- &.current{
- border-bottom: @loading_height solid fade(@theme_main, 80%);
- }
+ border-bottom: 1px solid transparent;
&:hover{
color: @theme_main;
- border-bottom: @loading_height solid @theme_main;
- }
- &:active,&.active{
- color: @theme_main;
- border-bottom: @loading_height solid @theme_main;
+ border-bottom: 1px solid @theme_main;
}
}
}
diff --git a/source/less/_fonts.less b/source/less/_fonts.less
index dae70fc..5b9fbf4 100755
--- a/source/less/_fonts.less
+++ b/source/less/_fonts.less
@@ -16,6 +16,12 @@
font-weight: normal;
font-style: normal;
}
+@font-face{
+ font-family: 'Source Sans Pro';
+ src: url(https://cdn.jsdelivr.net/gh/xaoxuu/cdn-fonts@master/SourceSansPro/SourceSansPro-Regular.ttf);
+ font-weight: normal;
+ font-style: normal;
+}
// 大部分文字字体
@fontfamily_base: 'Varela Round', "Source Sans Pro", "Helvetica Neue", Menlo, Monaco, monospace, "Lucida Console", sans-serif, Helvetica, "Hiragino Sans GB", "Hiragino Sans GB W3", Source Han Sans CN Regular, WenQuanYi Micro Hei, "Microsoft YaHei", Arial, sans-serif;