diff --git a/.gitignore b/.gitignore
index 1964dfb..1071321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,6 @@ public/
themes/yilia/source/css/
themes/yilia/source/js/
themes/yilia/source/fonts/
+themes/yilia/source/images/
themes/yilia/layout/_partial/css.ejs
themes/yilia/layout/_partial/script.ejs
\ No newline at end of file
diff --git a/themes/yilia/layout/_partial/archive-post.ejs b/themes/yilia/layout/_partial/archive-post.ejs
index 5a13836..a300d20 100644
--- a/themes/yilia/layout/_partial/archive-post.ejs
+++ b/themes/yilia/layout/_partial/archive-post.ejs
@@ -5,7 +5,7 @@
<%- partial('post/date', {class_name: 'archive-article-date', date_format: null}) %>
<%- partial('post/title', {class_name: 'archive-article-title'}) %>
-
+
<%- partial('post/tag') %>
<%- partial('post/category') %>
diff --git a/themes/yilia/layout/_partial/head.ejs b/themes/yilia/layout/_partial/head.ejs
index d88f3e8..b604560 100644
--- a/themes/yilia/layout/_partial/head.ejs
+++ b/themes/yilia/layout/_partial/head.ejs
@@ -5,16 +5,16 @@
<%
var title = page.title;
if (is_archive()){
- title = 'Archives';
+ title = __('archives');
if (is_month()){
title += ': ' + page.year + '/' + page.month;
} else if (is_year()){
title += ': ' + page.year;
}
} else if (is_category()){
- title = 'Category: ' + page.category;
+ title = __('category') + ': ' + page.category;
} else if (is_tag()){
- title = 'Tag: ' + page.tag;
+ title = __('tag') + ': ' + page.tag;
}
%>
diff --git a/themes/yilia/layout/_partial/post/category.ejs b/themes/yilia/layout/_partial/post/category.ejs
index 618913b..da4a8e1 100644
--- a/themes/yilia/layout/_partial/post/category.ejs
+++ b/themes/yilia/layout/_partial/post/category.ejs
@@ -4,7 +4,7 @@
<% post.categories.forEach(function(category, i){ %>
-
- <%-category.name%>
+ <%-category.name%>
<% }) %>
diff --git a/themes/yilia/layout/_partial/post/tag.ejs b/themes/yilia/layout/_partial/post/tag.ejs
index a6c931f..bdada88 100644
--- a/themes/yilia/layout/_partial/post/tag.ejs
+++ b/themes/yilia/layout/_partial/post/tag.ejs
@@ -4,7 +4,7 @@
<% post.tags.forEach(function(tag, i){ %>
-
- <%-tag.name%>
+ <%-tag.name%>
<% }) %>
diff --git a/themes/yilia/layout/_partial/tools.ejs b/themes/yilia/layout/_partial/tools.ejs
index 604be9a..7b0307d 100644
--- a/themes/yilia/layout/_partial/tools.ejs
+++ b/themes/yilia/layout/_partial/tools.ejs
@@ -43,7 +43,7 @@
<% site.tags.forEach(function(tag, i){ %>
-
- ','#')" class="js-tag color<%= tag.name.length % 5 + 1 %>"><%-tag.name%>
+ ','#')" class="js-tag color<%= tag.name.length % 7 + 1 %>"><%-tag.name%>
<% }) %>
@@ -51,7 +51,7 @@
<% site.categories.forEach(function(category, i){ %>
-
- ','$')" class="js-tag color<%= category.name.length % 5 + 1 %>"><%-category.name%>
+ ','$')" class="js-tag color<%= category.name.length % 7 + 1 %>"><%-category.name%>
<% }) %>
diff --git a/themes/yilia/layout/categories.ejs b/themes/yilia/layout/categories.ejs
index 84dd6e5..5ff18a2 100644
--- a/themes/yilia/layout/categories.ejs
+++ b/themes/yilia/layout/categories.ejs
@@ -16,12 +16,9 @@
<% } %>
<%- tagcloud({
- min_font: 16,
+ min_font: 20,
max_font: 35,
- amount: 999,
- color: true,
- start_color: 'gray',
- end_color: 'black',
+ amount: 999
}) %>
\ No newline at end of file
diff --git a/themes/yilia/source-src/css/archive.scss b/themes/yilia/source-src/css/archive.scss
index 76077b5..24618e4 100644
--- a/themes/yilia/source-src/css/archive.scss
+++ b/themes/yilia/source-src/css/archive.scss
@@ -4,6 +4,7 @@
padding-right: 60px;
border-bottom: 1px solid #eee;
background: $colorBg;
+ @extend %trans;
&:first-child{
margin-top: 30px;
}
@@ -35,6 +36,7 @@
padding:20px 0;
border-bottom: 1px solid #eee;
border-top: 1px solid #fff;
+ transition: border-color 0.2s ease-in;
position: relative;
&:first-child{
border-top: none;
@@ -79,17 +81,10 @@
min-height: 36px;
}
.article-meta{
- position: relative;
- float: right;
- margin-top: -10px;
- color: #555;
- background: none;
- text-align: right;
- width: auto;
- .article-date{
- time{
- color: $colorA;
- }
+ position: absolute;
+ top: 10px;
+ .article-date time{
+ color: $colorA;
}
.archive-article-date, .article-tag-list{
margin-right: 30px;
@@ -101,9 +96,6 @@
}
.archive-article-date{
cursor: default;
- font-size: 12px;
- margin-bottom: 5px;
- margin-top: -10px;
margin-right: 0;
}
.article-category{
diff --git a/themes/yilia/source-src/css/article-main.scss b/themes/yilia/source-src/css/article-main.scss
index e2eae3e..337a96b 100644
--- a/themes/yilia/source-src/css/article-main.scss
+++ b/themes/yilia/source-src/css/article-main.scss
@@ -49,9 +49,6 @@
}
.article-meta{
- width: 150px;
- font-size: 14;
- text-align: right;
position: absolute;
right: 0;
top: 23px;
@@ -86,10 +83,6 @@
}
}
}
-.article-info.info-on-right{
- margin: 10px 0 0 0;
- float: right;
-}
.article-info-index.article-info{
padding-top: 20px;
margin: 30px $articlePadding 0 $articlePadding;
diff --git a/themes/yilia/source-src/css/mobile.scss b/themes/yilia/source-src/css/mobile.scss
index fee28f8..79540bb 100644
--- a/themes/yilia/source-src/css/mobile.scss
+++ b/themes/yilia/source-src/css/mobile.scss
@@ -244,9 +244,6 @@ html, body, #container {
top: -30px;
color: #aaa;
}
-.info-on-right{
- float: initial;
-}
.archives-wrap{
margin: 10px 10px 0px;
padding: 10px;
diff --git a/themes/yilia/source-src/css/night.scss b/themes/yilia/source-src/css/night.scss
index a6b2a8c..9200ac8 100644
--- a/themes/yilia/source-src/css/night.scss
+++ b/themes/yilia/source-src/css/night.scss
@@ -73,4 +73,8 @@ body.night {
background: $mainBg_night;
color: #bf7676;
}
+ // 分类列表
+ .category-list li.category-list-item {
+ border-color: $borderColor_night;
+ }
}
\ No newline at end of file
diff --git a/themes/yilia/source-src/css/page/categories.scss b/themes/yilia/source-src/css/page/categories.scss
index 9c05758..1be90f6 100644
--- a/themes/yilia/source-src/css/page/categories.scss
+++ b/themes/yilia/source-src/css/page/categories.scss
@@ -5,8 +5,12 @@
display: inline-block;
margin: 0 1em .5em 0;
padding: 4px;
- border: 1px solid #d3d3d3;
+ border: 1px solid $colorBorder;
font-size: 1.2rem;
+ @extend %trans;
+ &:hover {
+ background:rgba(204, 204, 204, 0.3);
+ }
}
}
.category-count {
@@ -22,5 +26,21 @@
a {
margin: 0 20px;
word-break: keep-all;
+ position: relative;
+ &:hover::before {
+ width: 100%;
+ left: 0;
+ right: auto;
+ }
+ &::before {
+ content: "";
+ position: absolute;
+ width: 0;
+ right: 0;
+ bottom: 0;
+ height: 2px;
+ background: $colorLink;
+ transition: width .3s ease;
+ }
}
}
\ No newline at end of file
diff --git a/themes/yilia/source-src/css/tags.scss b/themes/yilia/source-src/css/tags.scss
index e12a20b..ea5987f 100644
--- a/themes/yilia/source-src/css/tags.scss
+++ b/themes/yilia/source-src/css/tags.scss
@@ -39,38 +39,20 @@
left: 2px;
}
}
- a.color1{
- background: #FF945C;
- &::before{
- border-right-color: #FF945C;
- }
- }
- a.color2{
- background: #cc8167;
- &::before{
- border-right-color: #cc8167;
- }
- }
- a.color3{
- background: #BA8F6C;
- &::before{
- border-right-color: #BA8F6C;
- }
- }
- a.color4{
- background: #94635c;
- &::before{
- border-right-color:#94635c;
- }
- }
- a.color5{
- background: #7B5D5F;
- &::before{
- border-right-color:#7B5D5F;
+ // 标签背景色
+ $tagcolorlist: #88acdb #ffa07a #f08080 #76becc #918597 #6fc0e4 #bc8f8f;
+
+ @for $index from 1 to length($tagcolorlist)+1 {
+ a.color#{$index}{
+ background: nth($tagcolorlist,$index);
+ &::before{
+ border-right-color: nth($tagcolorlist,$index);
+ }
}
}
}
+
.article-tag-list{
.article-tag-list-item{
float: left;
diff --git a/themes/yilia/source/images/scrollbar_arrow.png b/themes/yilia/source/images/scrollbar_arrow.png
deleted file mode 100644
index 81bba97..0000000
Binary files a/themes/yilia/source/images/scrollbar_arrow.png and /dev/null differ