widget_style (#1035)

Author: MHuiG

layout/_logic/_widget.ejs

@@ -1,5 +1,12 @@
 <%# 侧边栏组件控制 _%>
 <%_
+// 侧边栏所有样式列表
+let widget_style_list = [];
+// class
+if (item.class){
+  widget_style_list.push(item.class);
+}
+// platform
 let pf = [];
 if (item.display) {
   getList(item.display).forEach(function(p){
@@ -8,15 +15,23 @@ if (item.display) {
 } else {
   pf = ['desktop', 'mobile'];
 }
+widget_style_list.push(...pf);
+// effect
+let widget_effect = [];
 if (where == 'sidebar') {
-  page.widget_style = theme.custom_css.sidebar.effect.join(' ');
+  widget_effect = theme.custom_css.sidebar.effect;
 } else if (where == 'body') {
-  page.widget_style = theme.custom_css.body.effect.join(' ');
+  widget_effect = theme.custom_css.body.effect;
 }
-page.widget_platform = pf.join(' ');
+widget_style_list.push(...widget_effect);
+// pjax
 if (item.sticky === true  || item.pjaxReload === false){
   page.widget_pjax = "";
 } else {
-  page.widget_pjax = "pjax"
+  page.widget_pjax = "pjax";
+  widget_style_list.push("pjax");
 }
+
+// 汇总
+page.widget_style = widget_style_list.join(' ');
 _%>

layout/_widget/blogger.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %>">
+<section class="widget <%- page.widget_style %>">
   <div class='content'>
     <% if (item.avatar) { %>
       <% if (item.url) { %>

layout/_widget/category.ejs

@@ -1,6 +1,6 @@
 <% if (site.categories.length){ %>
   <%- partial('_pre') %>
-  <section class="widget <%- item.class %> <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %>">
+  <section class="widget <%- page.widget_style %>">
     <%- partial('header', {item: item}) %>
     <div class='content'>
       <ul class="entry navigation">

layout/_widget/copyright.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %>">
+<section class="widget <%- page.widget_style %>">
   <div class='content'>
     <% if (item.blockquote == true) { %>
       <blockquote>

layout/_widget/grid.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %>">
+<section class="widget <%- page.widget_style %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <div class="grid navigation<%- item.fixed ? ' fixed' : '' %>">

layout/_widget/lastupdate.ejs

@@ -19,7 +19,7 @@ function genList() {
 }
 %>
 <%- partial('_pre') %>
-<section class="widget <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %>">
+<section class="widget <%- page.widget_style %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <%- genList() %>

layout/_widget/list.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class == 'list' ? item.class : 'list ' + item.class %> <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %>">
+<section class="widget <%- item.class != 'list' ? 'list ' : '' %> <%- page.widget_style %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <ul class="list entry navigation">

layout/_widget/memos_carousel.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %>">
+<section class="widget <%- page.widget_style %>">
     <%- partial('header', {item: item}) %>
     <div class='content'>
         <div class='bber-talk'>

layout/_widget/music.ejs

@@ -1,6 +1,6 @@
 <%- partial('_pre') %>
 <% if (theme.plugins.aplayer.enable == true) { %>
-  <section class='widget <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %> <%- item.class %>'>
+  <section class='widget <%- page.widget_style %>'>
     <%- partial('header', {item: item}) %>
     <div class='content'>
       <%- partial('../_plugins/aplayer/layout', {post: null, where: 'widget'}) %>

layout/_widget/page.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<section class="widget <%- item.class %> <%- page.widget_platform %> <%- page.widget_style %> <%- page.widget_pjax %>">
+<section class="widget <%- page.widget_style %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <% site.pages.forEach(function(post){ %>