From 546384f1b9f35c235a781468939b2f740d31ab3d Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Sun, 23 Dec 2018 15:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=B7=B1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=97=E8=A1=A8=E7=B1=BB=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/_partial/side.ejs      | 12 ++++++++++--
 layout/_widget/author.ejs     |  2 +-
 layout/_widget/categories.ejs |  2 +-
 layout/_widget/links.ejs      |  2 +-
 layout/_widget/music.ejs      |  2 +-
 layout/_widget/tagcloud.ejs   |  2 +-
 layout/_widget/toc.ejs        |  2 +-
 source/less/_toc.less         |  2 +-
 source/less/_widget.less      | 36 +++++++++++++++++++++++++++--------
 9 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/layout/_partial/side.ejs b/layout/_partial/side.ejs
index ecd00ab..0cb775f 100755
--- a/layout/_partial/side.ejs
+++ b/layout/_partial/side.ejs
@@ -4,7 +4,7 @@
     <% } %>
     <% if (config.widgets){ %>
       <% (config.widgets||[]).forEach(function(item){ %>
-        <section class='m_widget' id='mywidget'>
+        <section class='mywidget' id='<%- item.type ? item.type : '' %>'>
           <% if(item.icon && item.title) { %>
             <header class='header <%= theme.style %>'>
                 <div><i class="<%= item.icon %> fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;<%= item.title %></div>
@@ -15,7 +15,15 @@
             </header>
             <%} %>
             <div class='content <%= theme.style %>'>
-              <%- item.body %>
+              <% if(item.type == 'list') { %>
+                <ul class="entry">
+                  <% (item.rows||[]).forEach(function(row){ %>
+                    <li><a class="flat-box" href="<%= url_for(row.url) %>"><i class="<%= row.icon %> fa-fw"></i><div class='name'><%= row.name %></div></a>
+                  <% }) %>
+                </ul>
+              <% } else { %>
+                <%- item.body %>
+              <% } %>
             </div>
         </section>
       <% }) %>
diff --git a/layout/_widget/author.ejs b/layout/_widget/author.ejs
index a2f4d15..8b7804c 100755
--- a/layout/_widget/author.ejs
+++ b/layout/_widget/author.ejs
@@ -1,5 +1,5 @@
 <% if(theme.widgets.author.enable != false) { %>
-  <section class='m_widget' id='author'>
+  <section class='author'>
     <% if(theme.widgets.author.avatar) { %>
       <div class='header'>
         <img class='avatar' src='<%= url_for(config.avatar ? config.avatar : "https://img.vim-cn.com/a4/87a96e2e01b1180bba1e76e190df5220378c1a.png") %>'/>
diff --git a/layout/_widget/categories.ejs b/layout/_widget/categories.ejs
index 723d691..89f03bd 100755
--- a/layout/_widget/categories.ejs
+++ b/layout/_widget/categories.ejs
@@ -1,4 +1,4 @@
-<section class='m_widget' id='categories'>
+<section class='categories'>
     <header class='header <%= theme.style %>'>
         <div><i class="<%= theme.widgets.categories.icon %> fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;<%= theme.widgets.categories.title %></div>
     </header>
diff --git a/layout/_widget/links.ejs b/layout/_widget/links.ejs
index db7c793..afb53c0 100755
--- a/layout/_widget/links.ejs
+++ b/layout/_widget/links.ejs
@@ -1,4 +1,4 @@
-<section class='m_widget' id='links'>
+<section class='links'>
     <header class='header <%= theme.style %>'>
         <div><i class="<%= theme.widgets.links.icon %> fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;<%= theme.widgets.links.title %></div>
         <% if(config.title && theme.widgets.links.mailto) { %>
diff --git a/layout/_widget/music.ejs b/layout/_widget/music.ejs
index fefa0a6..779848d 100755
--- a/layout/_widget/music.ejs
+++ b/layout/_widget/music.ejs
@@ -39,7 +39,7 @@ if (theme.widgets.music && theme.widgets.music.display) {
 %>
 
 <% if (needDisplay == true) { %>
-  <section class='m_widget' id='music'>
+  <section class='music'>
     <header class='header <%= theme.style %>'>
       <div><i class="<%= theme.widgets.music.icon %> fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;<%= theme.widgets.music.title %></div>
       <a class="rightBtn" target="_blank" rel="external nofollow noopener noreferrer" href="<%= theme.widgets.music.link %>"><i class="far fa-heart fa-fw"></i></a>
diff --git a/layout/_widget/tagcloud.ejs b/layout/_widget/tagcloud.ejs
index 319fed3..a359357 100755
--- a/layout/_widget/tagcloud.ejs
+++ b/layout/_widget/tagcloud.ejs
@@ -1,5 +1,5 @@
 <% if (site.tags.length){ %>
-    <section class='m_widget' id='tagcloud'>
+    <section class='tagcloud'>
         <header class="header <%= theme.style %>">
             <div><i class="<%= theme.widgets.tagcloud.icon %> fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;<%= theme.widgets.tagcloud.title %></div>
         </header>
diff --git a/layout/_widget/toc.ejs b/layout/_widget/toc.ejs
index 80093ac..6d8961b 100755
--- a/layout/_widget/toc.ejs
+++ b/layout/_widget/toc.ejs
@@ -1,5 +1,5 @@
 <% if(page.layout == 'post' && page.content && page.toc!==false && toc(page.content).length > 0){ %>
-    <section class='m_widget toc-wrapper'>
+    <section class='toc-wrapper'>
         <header class="header <%= theme.style %>">
             <div><i class="<%= theme.widgets.toc.icon %> fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;<%= theme.widgets.toc.title %></div>
             <div class='wrapper'><a class="s-toc rightBtn" title="固定到顶部" rel="external nofollow noopener noreferrer" href="javascript:void(0)"><i class="fas fa-thumbtack fa-fw"></i></a></div>
diff --git a/source/less/_toc.less b/source/less/_toc.less
index ce38867..8e18d99 100755
--- a/source/less/_toc.less
+++ b/source/less/_toc.less
@@ -1,4 +1,4 @@
-.m_widget.toc-wrapper{
+.l_side .toc-wrapper{
     z-index: 1;
     overflow: auto;
     border-radius: @border_radius;
diff --git a/source/less/_widget.less b/source/less/_widget.less
index 898a475..06d13c6 100755
--- a/source/less/_widget.less
+++ b/source/less/_widget.less
@@ -1,4 +1,4 @@
-.m_widget{
+.l_side section{
     z-index: 0;
     &:extend(.z-depth-main);
     background: @theme_cardbg;
@@ -70,7 +70,7 @@
         max-height: ~"calc(100% - @{height_navbar} - 12.5 * @{gap})";
         ul.entry > li > a{
            padding: 0 @gap;
-           line-height:@height_cell;
+           line-height: @height_cell;
            height: @height_cell;
            display: flex;
            justify-content: space-between;
@@ -98,7 +98,7 @@
     }
 
 
-    &#author{
+    &.author{
         .enable-trans();
         h2{
             text-align: center;
@@ -178,7 +178,8 @@
         }
     }
 
-    &#mywidget{
+
+    &.mywidget{
       .content{
           font-size: @fontsize_small;
           font-weight: bold;
@@ -200,9 +201,28 @@
             }
           }
       }
+      &#list{
+        .content{
+            padding: @gap/2 0;
+            &.pure{
+              padding-top: 0; // 适合白色导航栏背景
+            }
+            a{
+              &:hover{
+                text-decoration: none;
+              }
+              i{
+                color: fade(@color_text_main,70%);
+                line-height: @height_cell;
+                margin-right: 8px;
+              }
+            }
+        }
+      }
     }
 
-    &#categories{
+
+    &.categories{
         .content{
             padding: @gap/2 0;
             &.pure{
@@ -211,7 +231,7 @@
         }
     }
 
-    &#tagcloud{
+    &.tagcloud{
         .content{
             text-align: justify;
             padding: @gap/2 @gap;
@@ -230,7 +250,7 @@
         }
     }
 
-    &#music{
+    &.music{
         .header{
           &.pure{
             padding-bottom: @gap/4; // 适合白色导航栏背景
@@ -249,7 +269,7 @@
     }
 
 
-    &#links{
+    &.links{
         .header{
             .rightBtn{
               &:hover{