Merge branch 'master' into myblog

_config.yml

@@ -8,7 +8,7 @@ info:
   name: Material X
   docs: https://xaoxuu.com/wiki/material-x/
   # 主题的CDN地址。如需启用CDN，请在主目录的config中设置，详见文档。
-  cdn: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@19.3.28/
+  cdn: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@19.3.31/
 
 
 ############################### 主题样式 ###############################

layout/_partial/article.ejs

@@ -106,7 +106,7 @@
 
 <script>
     window.subData = {
-        title: '<%= post.title %>',
+        title: '<%- post.title %>',
         tools: true
     }
 </script>

layout/_partial/meta.ejs

@@ -18,7 +18,7 @@
       <h2 class="title">
           <a href="<%- url_for(post.path) %>">
               <% if(post.title){ %>
-                  <%= post.title %>
+                  <%- post.title %>
               <% } else if (post.date) { %>
                   <%= date(post.date, config.date_format) %>
               <% } %>
@@ -26,7 +26,7 @@
       </h2>
     <% } else { %>
       <% if(post.title){ %>
-          <h1 class="title"><%= post.title %></h1>
+          <h1 class="title"><%- post.title %></h1>
       <% } else if (post.date) { %>
           <h1 class="title"><%= date(post.date, config.date_format) %></h1>
       <% } %>

layout/_third-party/fancybox.ejs

@@ -1,7 +1,7 @@
 <script src="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.js"></script>
 <script>
   let LAZY_LOAD_IMAGE = "<%- config.lazyload %>";
-  $(".article-entry").find("img").each(function () {
+  $(".article.typo").find("img").each(function () {
       var element = document.createElement("a");
       $(element).attr("data-fancybox", "gallery");
       $(element).attr("href", $(this).attr("src"));

layout/archive.ejs

@@ -20,13 +20,22 @@
               <time><%= date(post.date, 'MM-DD') %></time>
               <span class="title">
                 <% if(post.title){ %>
-                  <%= post.title %>
+                  <%- post.title %>
                 <% } else if (post.date) { %>
                   <%= date(post.date, config.date_format) %>
                 <% } %>
-                <% if(post.music || post.video){ %>
-                  &nbsp;<i class="music fas fa-headphones-alt" aria-hidden="true"></i>
+                <% if(post.music){ %>
+                  &nbsp;<i class="fas fa-music" aria-hidden="true"></i>
                 <% } %>
+                <% if(post.video){ %>
+                  &nbsp;<i class="fas fa-video" aria-hidden="true"></i>
+                <% } %>
+								<% if (post.icon) { %>
+									&nbsp;<i class="<%- post.icon %>" aria-hidden="true"></i>
+								<% } %>
+								<% (post.icons && post.icons||[]).forEach(function(icon){ %>
+								&nbsp;<i class="<%- icon %>" aria-hidden="true"></i>
+								<% }) %>
               </span>
             </a>
           </div>

source/less/_archive.less

@@ -44,7 +44,7 @@
         padding: .5em;
         font-size: @fontsize_small;
         color: fade(@color_text_main,80%);
-        i.music{
+        i{
           color: @theme_main;
         }
       }

source/less/_base.less

@@ -267,7 +267,7 @@ li {
       padding: 8px;
     }
     &:active {
-      border-left: max(@border_radius, @border_radius_line) solid @theme_main;
+      border-left: 2*@border_radius_line solid @theme_main;
     }
 
   }

source/less/_fonts.less

@@ -18,7 +18,7 @@
 }
 
 // 大部分文字字体
-@fontfamily_base: 'Varela Round', Menlo, Monaco, monospace, "Lucida Console", sans-serif, "Source Sans Pro", "Helvetica Neue", Helvetica, "Hiragino Sans GB", "Hiragino Sans GB W3", Source Han Sans CN Regular, WenQuanYi Micro Hei, "Microsoft YaHei", Arial, sans-serif;
+@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;
 // 代码字体
 @fontfamily_code: Menlo, Monaco, monospace, "Lucida Console", 'Source Code Pro', "Microsoft YaHei", Helvetica, Arial, sans-serif, 'Ubuntu';
 // LOGO字体