From 2a821fce6a41975a2cec4a64b0891b729f94e36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=93=E5=8F=91=E5=8F=97=E9=95=BF=E7=94=9F?=
 <init_pro@aliyun.com>
Date: Tue, 14 May 2019 19:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E8=89=B2=E6=96=B9=E6=A1=88=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 themes/yilia/layout/_partial/archive-post.ejs |   2 +-
 themes/yilia/layout/_partial/head.ejs         |   6 +--
 .../yilia/layout/_partial/post/category.ejs   |   2 +-
 themes/yilia/layout/_partial/post/tag.ejs     |   2 +-
 themes/yilia/layout/_partial/tools.ejs        |   4 +-
 themes/yilia/layout/categories.ejs            |   7 +---
 themes/yilia/source-src/css/archive.scss      |  20 +++------
 themes/yilia/source-src/css/article-main.scss |   7 ----
 themes/yilia/source-src/css/mobile.scss       |   3 --
 themes/yilia/source-src/css/night.scss        |   4 ++
 .../yilia/source-src/css/page/categories.scss |  22 +++++++++-
 themes/yilia/source-src/css/tags.scss         |  38 +++++-------------
 .../yilia/source/images/scrollbar_arrow.png   | Bin 3065 -> 0 bytes
 14 files changed, 52 insertions(+), 66 deletions(-)
 delete mode 100644 themes/yilia/source/images/scrollbar_arrow.png

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}) %>
         </div>
     	 <%- partial('post/title', {class_name: 'archive-article-title'}) %>
-        <div class="article-info info-on-right">
+        <div class="article-info">
           <%- partial('post/tag') %>
           <%- partial('post/category') %>
         </div>
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;
   }
   %>
   <meta name="renderer" content="webkit">
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 @@
 		<ul class="article-tag-list">
 			<% post.categories.forEach(function(category, i){ %> 
 				<li class="article-tag-list-item">
-					<a href="<%=url_for(category.path) %>" class="js-tag article-tag-list-link color<%= category.name.length % 5 + 1 %>"><%-category.name%></a>
+					<a href="<%=url_for(category.path) %>" class="js-tag article-tag-list-link color<%= category.name.length % 7 + 1 %>"><%-category.name%></a>
 				</li>
 			<% }) %>
 		</ul>
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 @@
 		<ul class="article-tag-list">
 			<% post.tags.forEach(function(tag, i){ %> 
 				<li class="article-tag-list-item">
-					<a href="<%= url_for(tag.path) %>" class="js-tag article-tag-list-link color<%= tag.name.length % 5 + 1 %>"><%-tag.name%></a>
+					<a href="<%= url_for(tag.path) %>" class="js-tag article-tag-list-link color<%= tag.name.length % 7 + 1 %>"><%-tag.name%></a>
 				</li>
 			<% }) %>
 		</ul>
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 @@
           <ul class="article-tag-list" v-show="showTags">
             <% site.tags.forEach(function(tag, i){ %> 
               <li class="article-tag-list-item">
-                <a href="javascript:void(0)" @click="chose('<%-tag.name%>','#')" class="js-tag color<%= tag.name.length % 5 + 1 %>"><%-tag.name%></a>
+                <a href="javascript:void(0)" @click="chose('<%-tag.name%>','#')" class="js-tag color<%= tag.name.length % 7 + 1 %>"><%-tag.name%></a>
               </li>
             <% }) %>
             <div class="clearfix"></div>
@@ -51,7 +51,7 @@
           <ul class="article-tag-list" v-show="showCategories">
             <% site.categories.forEach(function(category, i){ %> 
               <li class="article-tag-list-item">
-                <a href="javascript:void(0)" @click="chose('<%-category.name%>','$')" class="js-tag color<%= category.name.length % 5 + 1 %>"><%-category.name%></a>
+                <a href="javascript:void(0)" @click="chose('<%-category.name%>','$')" class="js-tag color<%= category.name.length % 7 + 1 %>"><%-category.name%></a>
               </li>
             <% }) %>
             <div class="clearfix"></div>
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 @@
   <% } %>
   <div class="tag-cloud">
     <%- tagcloud({
-      min_font: 16, 
+      min_font: 20, 
       max_font: 35, 
-      amount: 999, 
-      color: true, 
-      start_color: 'gray', 
-      end_color: 'black',
+      amount: 999
     }) %>
   </div>
 </article>
\ 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 81bba9723bc4ed8494399605c1f66ba7f7dae47c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3065
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
Hu0mjfU(Umt