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.2/
+  cdn: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@19.3.22/
 
 
 ############################### 主题样式 ###############################

layout/_widget/tagcloud.ejs

@@ -6,8 +6,8 @@
           min_font: 14,
           max_font: 24,
           color: true,
-          start_color: '#999',
-          end_color: '#555',
+          start_color: item.start_color ? item.start_color : '#999',
+          end_color: item.end_color ? item.end_color : '#555',
       }) %>
     </div>
   </section>

source/less/_article.less

@@ -213,7 +213,7 @@
       font-weight: bold;
       background-color: @theme_main;
       padding: .2em 2.4em;
-      color: white;
+      color: @color_text_in_header;
       border-radius: @border_radius/2;
       .enable-trans();
       &:hover {
@@ -452,6 +452,43 @@
   }
 
 
+  //代码块复制按钮
+  .highlight{
+      //方便copy代码按钮（btn-copy）的定位
+      position: relative;
+  }
+  .btn-copy {
+      display: inline-block;
+      cursor: pointer;
+      background-color: #eee;
+      background-image: linear-gradient(#fcfcfc,#eee);
+      border: 1px solid #d5d5d5;
+      border-radius: 3px;
+      -webkit-user-select: none;
+      -moz-user-select: none;
+      -ms-user-select: none;
+      user-select: none;
+      -webkit-appearance: none;
+      font-size: 13px;
+      font-weight: 700;
+      line-height: 20px;
+      color: #333;
+      -webkit-transition: opacity .3s ease-in-out;
+      -o-transition: opacity .3s ease-in-out;
+      transition: opacity .3s ease-in-out;
+      padding: 2px 6px;
+      position: absolute;
+      right: 5px;
+      top: 5px;
+      opacity: 0;
+  }
+  .btn-copy span {
+      margin-left: 5px;
+  }
+  .highlight:hover .btn-copy{
+      opacity: 1;
+  }
+  
 /* Handle */
 
   &::-webkit-scrollbar-thumb {

source/less/_color.less

@@ -19,7 +19,7 @@
 // 代码的背景色
 @color_bg_code: fade(@theme_main, 10%);
 // 代码块的背景色
-@color_bg_code_block: #F8F8F8;
+@color_bg_code_block: @theme_background;
 // 引用的颜色
 @color_bg_quote: @theme_main;
 // 选中部分文字的背景颜色

source/less/_header.less

@@ -285,8 +285,6 @@
   }
 }
 
-
-
 .menu-phone{
   .header{
     border-top-left-radius: @border_radius;

source/less/_main.less

@@ -72,7 +72,7 @@
         padding-right: 2.4em;
         font-weight: bold;
         background-color: @theme_main;
-        color: white;
+        color: @color_text_in_header;
         border-radius: @border_radius/2;
         .enable-trans();
         &:hover {

source/less/_search.less

@@ -230,7 +230,7 @@
       left: 0;
       overflow-y: scroll;
       -webkit-overflow-scrolling: touch;
-
+      background-color: @theme_cardbg;
       @media (max-width: @on_modal_threshold) {
         padding: 60px 20px 80px 20px;
     	}