From 4f5f3c2b2d16e26255e58d03ca11806c38e21076 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: Thu, 13 Jun 2019 23:08:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BC=98=E5=8C=96=E2=9E=95?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2CDN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _config.yml                               | 2 +-
 gulpfile.js                               | 5 +++--
 themes/yilia/_config.yml                  | 2 +-
 themes/yilia/layout/_partial/live2d.ejs   | 4 ++--
 themes/yilia/layout/_partial/post/nav.ejs | 6 ++----
 themes/yilia/source-src/css/left.scss     | 4 ++--
 themes/yilia/source-src/css/night.scss    | 3 +++
 themes/yilia/source-src/css/waifu.scss    | 2 +-
 themes/yilia/source-src/js/slider.js      | 1 +
 themes/yilia/source-src/js/waifu.js       | 2 +-
 10 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/_config.yml b/_config.yml
index 0e45b7d..0d1a444 100644
--- a/_config.yml
+++ b/_config.yml
@@ -93,7 +93,7 @@ pagination_dir: page
 theme: yilia
 
 # 图片存储仓库地址
-picture_cdn: https://blog-cdn.nos-eastchina1.126.net
+picture_cdn: https://cdn.colorfulsweet.site
 
 # ICP备案号
 ICP: 鲁ICP备19028444号
diff --git a/gulpfile.js b/gulpfile.js
index 2c6760d..fbe25e2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -33,7 +33,8 @@ gulp.task('compressHtml', () => {
     unprotect: /<script [^>]*\btype="text\/x-handlebars-template"[\s\S]+?<\/script>/ig //特殊处理
   }
   const minOption = {
-    collapseWhitespace: true,           //压缩HTML
+    collapseWhitespace: true,           //删除html中的空白
+    conservativeCollapse: true,         //将多个空白折叠为1空白(永远不要完全移除), 必须与 collapseWhitespace=true 一起使用
     collapseBooleanAttributes: true,    //省略布尔属性的值  <input checked="true"/> ==> <input />
     removeEmptyAttributes: true,        //删除所有空属性值    <input id="" /> ==> <input />
     removeScriptTypeAttributes: true,   //删除<script>的type="text/javascript"
@@ -41,7 +42,7 @@ gulp.task('compressHtml', () => {
     removeComments: true,               //清除HTML注释
     minifyJS: true,                     //压缩页面JS
     minifyCSS: true,                    //压缩页面CSS
-    minifyURLs: true                    //替换页面URL
+    minifyURLs: false                   //替换页面URL
   }
   return gulp.src('./public/**/*.html')
     .pipe(plumber())
diff --git a/themes/yilia/_config.yml b/themes/yilia/_config.yml
index 01badf4..1859472 100644
--- a/themes/yilia/_config.yml
+++ b/themes/yilia/_config.yml
@@ -71,7 +71,7 @@ google_analytics: ''
 favicon: /favicon.ico
 
 #你的头像url
-avatar: https://blog-cdn.nos-eastchina1.126.net/resources/avatar.jpg
+avatar: https://cdn.colorfulsweet.site/resources/avatar.jpg
 
 #是否开启分享
 share_jia: true
diff --git a/themes/yilia/layout/_partial/live2d.ejs b/themes/yilia/layout/_partial/live2d.ejs
index 4195d6d..9523cf0 100644
--- a/themes/yilia/layout/_partial/live2d.ejs
+++ b/themes/yilia/layout/_partial/live2d.ejs
@@ -1,7 +1,7 @@
 <div class="waifu" @mouseover="waifu.showTools=true" @mouseout="waifu.showTools=false">
   <div class="waifu-tips" v-text="waifu.tip" v-bind:style="{opacity: waifu.tipOpacity}"></div>
-  <div style="width: 250px;overflow: hidden;">
-    <canvas id="live2d" width="650" height="600" @mouseover="linkMouseover('waifu')" style="width: 325px;height: 300px;"></canvas>
+  <div>
+    <canvas id="live2d" width="520" height="480" @mouseover="linkMouseover('waifu')" style="width: 260px;height: 240px;"></canvas>
   </div>
   <div class="waifu-tool" v-show="waifu.showTools">
     <span class="icon icon-eye" @mouseover="linkMouseover('tools.eye')" @click="toolsClick('tools.eye')"></span>
diff --git a/themes/yilia/layout/_partial/post/nav.ejs b/themes/yilia/layout/_partial/post/nav.ejs
index aeb31c0..ab0470b 100644
--- a/themes/yilia/layout/_partial/post/nav.ejs
+++ b/themes/yilia/layout/_partial/post/nav.ejs
@@ -3,16 +3,14 @@
   <% if (post.prev){ %>
     <a href="<%- url_for(post.prev.path) %>" id="article-nav-newer" class="article-nav-link-wrap">
       <div class="article-nav-title">
-        <i class="icon icon-arrow-circle-o-left"></i>
-        <%= post.prev.title %>
+        <i class="icon icon-arrow-circle-o-left"></i>&nbsp;<%= post.prev.title %>
       </div>
     </a>
   <% } %>
   <% if (post.next){ %>
     <a href="<%- url_for(post.next.path) %>" id="article-nav-older" class="article-nav-link-wrap">
       <div class="article-nav-title">
-        <%= post.next.title %>
-        <i class="icon icon-arrow-circle-o-right"></i>
+        <%= post.next.title %>&nbsp;<i class="icon icon-arrow-circle-o-right"></i>
       </div>
     </a>
   <% } %>
diff --git a/themes/yilia/source-src/css/left.scss b/themes/yilia/source-src/css/left.scss
index 806c174..4d06dd8 100644
--- a/themes/yilia/source-src/css/left.scss
+++ b/themes/yilia/source-src/css/left.scss
@@ -11,7 +11,7 @@
 	}
 	.overlay{
 		width: 100%;
-		height: 150px;
+		height: 130px;
 		position: absolute;
     background: #4d4d4d;
     @extend %trans;
@@ -20,7 +20,7 @@
 	.intrude-less {
 		width: 76%;
 		text-align: center;
-		margin: 82px auto 0;
+		margin: 62px auto 0;
 	}
 
 	#header{
diff --git a/themes/yilia/source-src/css/night.scss b/themes/yilia/source-src/css/night.scss
index 1d0e5be..e1e036f 100644
--- a/themes/yilia/source-src/css/night.scss
+++ b/themes/yilia/source-src/css/night.scss
@@ -87,6 +87,9 @@ body.night {
   }
   #mobile-nav {
     background: none;
+    .overlay {
+      display: none;
+    }
   }
   .overlay {
     background: none;
diff --git a/themes/yilia/source-src/css/waifu.scss b/themes/yilia/source-src/css/waifu.scss
index 47b8d5a..399a486 100644
--- a/themes/yilia/source-src/css/waifu.scss
+++ b/themes/yilia/source-src/css/waifu.scss
@@ -57,7 +57,7 @@
   .waifu-tool {
     color: $colorA;
     top: 100px;
-    right: 10px;
+    right: 60px;
     font-size: 14px;
     position: absolute;
     span {
diff --git a/themes/yilia/source-src/js/slider.js b/themes/yilia/source-src/js/slider.js
index 8ac59f2..8b5975a 100644
--- a/themes/yilia/source-src/js/slider.js
+++ b/themes/yilia/source-src/js/slider.js
@@ -59,6 +59,7 @@ new Vue({
       }
     },
     linkMouseover(name) {
+      if(name === 'waifu' && waifuTipTimer) return
       this.showMessage(waifuTips.mouseover[name], 3000)
     },
     toolsClick(name) {
diff --git a/themes/yilia/source-src/js/waifu.js b/themes/yilia/source-src/js/waifu.js
index b4a7634..a9171c8 100644
--- a/themes/yilia/source-src/js/waifu.js
+++ b/themes/yilia/source-src/js/waifu.js
@@ -16,7 +16,7 @@ export default {
   init() {
     if(!isMobile && isSupportWebGL()) {
       // 加载live2d模型
-      loadlive2d('live2d', 'https://blog-cdn.nos-eastchina1.126.net/live2D/Kesshouban/model.json')
+      loadlive2d('live2d', window.themeConfig.pictureCdn + '/live2D/Kesshouban/model.json')
       document.querySelector('.waifu').style.display = 'block'
     }
   }