hexo-theme-solitude 1.4.7 → 1.5.1

package/layout/includes/widgets/nav/menu.pug

@@ -1,16 +1,20 @@
-.menus_items
-    - var menu = theme.nav && theme.nav.menu ? theme.nav.menu : {}
-    each value, x in menu
-        .menus_item
-            if !value.url
-                a.site-page(href="javascript:void(0);")
-                    span= x
-                ul.menus_item_child
-                    each childValue, y in value.child
-                        li
-                            a.site-page.child(href=url_for(childValue.url))
-                                i.scoicon(class=childValue.icon)
-                                span= y
-            else
-                a.site-page.not-child(href=url_for(value.url))
-                    span= x
+- var menu = theme.nav.menu
+
+if menu
+    .menus_items
+        each value, label in menu
+            .menus_item
+                if typeof value !== 'object'
+                    a.site-page(href=url_for(value))
+                        span= label
+                else
+                    a.site-page(href="javascript:void(0);")
+                        span= label
+                    ul.menus_item_child
+                        each childValue, childLabel in value
+                            li
+                                - var array = childValue.split('||')
+                                a.site-page.child(href=url_for(trim(array[0])))
+                                    if array[1]
+                                        i.scoicon(class=array[1])
+                                    span= childLabel

package/layout/includes/widgets/page/about/award.pug

@@ -14,7 +14,7 @@ if site.data.about.rewardList
                     .reward-list-item
                         .reward-list-item-name= reward.name
                         .reward-list-bottom-group
-                            .reward-list-item-money(style=(reward.vip ? "background: var(--sco-vip);" : ""))
+                            .reward-list-item-money(style=(reward.vip ? "background: var(--sco-vip);color: var(--sco-white)" : ""))
                                 if reward.icon
                                     i.scoicon(class=reward.icon)
                                 | ¥ #{reward.money}

package/layout/includes/widgets/page/equipment/content.pug

@@ -10,7 +10,7 @@
                             .equipment-item-content-item-cover
                                 img.equipment-item-content-item-image(src=item.image, alt=item.name)
                             .equipment-item-content-item-info
-                                .equipment-item-content-item-name= item.name
+                                .equipment-item-content-item-name(onclick='utils.copy("' + item.name + '")')= item.name
                                 .equipment-item-content-item-specification= item.specification
                                 .equipment-item-content-item-description= item.description
                                 if item.link

package/layout/includes/widgets/page/links/linksCard.pug

@@ -6,7 +6,6 @@
                     i.light
             a.img(title=item.name, href=url_for(item.link))
                 img.flink-avatar(src=item.topimg + (data.topimg_suffix || ''), alt=item.name)
-                .img-alt.is-center= item.name
             a.info.cf-friends-link(title=item.name, href=url_for(item.link))
                 .site-card-avatar
                     img.flink-avatar.cf-friends-avatar(src=item.avatar + (data.suffix || ''), alt=item.name)

package/layout/includes/widgets/third-party/comments/waline.pug

@@ -11,4 +11,6 @@ script.
             search: false,
             comment: #{theme.post.meta.comment && is_post()},
         }, !{JSON.stringify(option)}))
+
+        GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll('#comment .wl-content img:not(.wl-emoji)'))
     }

package/layout/includes/widgets/third-party/news-comment/twikoo.pug

@@ -44,12 +44,12 @@ script.
             const $dom = document.querySelector('#card-newest-comments .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
-                  <a href='${item.url}' class='thumbnail'>
+                  <a onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
                     <img src='${item.avatar}' alt='${item.nick}'>
                     <div class='name'><span>${item.nick}</span></div>
                   </a>
                   <div class='content'>
-                    <a class='comment' href='${item.url}'>${item.content}</a>
+                    <a class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</a>
                     <time class="datetime" datetime="${item.date}"></time>
                   </div>
                 </div>

package/layout/includes/widgets/third-party/news-comment/waline.pug

@@ -45,12 +45,12 @@ script.
             const $dom = document.querySelector('#card-newest-comments .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
-                  <a href='${item.url}' class='thumbnail'>
+                  <a onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
                     <img src='${item.avatar}' alt='${item.nick}'>
                     <div class='name'><span>${item.nick}</span></div>
                   </a>
                   <div class='content'>
-                    <a class='comment' href='${item.url}'>${item.content}</a>
+                    <a class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</a>
                     <time class="datetime" datetime="${item.date}"></time>
                   </div>
                 </div>

package/layout/includes/widgets/third-party/search/algolia-search.pug

@@ -12,7 +12,7 @@
         #search-results
             #algolia-hits
                 each tag in theme.search.tags || []
-                    a.tag-list(href='/tags/' + tag + '/')=tag
+                    a.tag-list(href="javascript:void(0);" onclick="pjax.loadUrl('/tags/" + tag + "/')")=tag
 
         #algolia-tips
             #algolia-pagination

package/layout/includes/widgets/third-party/search/local-search.pug

@@ -10,7 +10,7 @@
             div#search-results
                 #search-hits
                     each tag in theme.search.tags || []
-                        a.tag-list(href='/tags/' + tag + '/')=tag
+                        a.tag-list(href='javascript:void(0);' onclick="pjax.loadUrl('/tags/" + tag + "/')")=tag
             div#search-pagination
             div#search-tips
     div#search-mask

package/layout/index.pug

@@ -1,20 +1,20 @@
-extends includes/layout.pug
+extends includes/layout
 
 block content
     #home_top
         if theme.says.home_mini
             include ./includes/widgets/home/bbTimeList
         if theme.hometop.banner.enable && is_home_first_page()
-            include ./includes/widgets/home/hometop.pug
+            include ./includes/widgets/home/hometop
     main.layout#content-inner
         .recent-posts#recent-posts
             #category-bar
-                include ./includes/widgets/home/categoryBar.pug
+                include ./includes/widgets/home/categoryBar
             for post in page.posts.sort("-sticky" || "-date").data
-                include ./includes/widgets/home/postList.pug
+                include ./includes/widgets/home/postList
 
             // pageination
-            include ./includes/mixins/pagination.pug
+            include ./includes/mixins/pagination
 
         // aside
-        include ./includes/widgets/aside/aside.pug
+        include ./includes/widgets/aside/aside

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.4.7",
+  "version": "1.5.1",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the wleelw",
   "main": "package.json",
   "scripts": {

package/plugins.yml

@@ -19,11 +19,6 @@ waline_js:
   file: dist/waline.js
   other_name: waline
   version: 2.15.8
-waline_css:
-  name: '@waline/client'
-  file: dist/waline.css
-  other_name: waline
-  version: 2.15.8
 sharejs:
   name: butterfly-extsrc
   file: sharejs/dist/js/social-share.min.js

package/scripts/helper/stylus.js

@@ -21,4 +21,31 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     }
 
     style.define('about', data && data.about ? Object.keys(data.about) : []);
-});
+
+    initGroupColor(theme.config.hometop.group,style);
+});
+
+function initGroupColor(gg,style) {
+    if(gg === null || gg === undefined) {
+        style.define('banner_group', [])
+        return;
+    }
+    let group = Object.keys(gg).map(key => {
+        return {
+            [key]: (gg[key]).split('||')[2]
+        }
+    });
+
+    style.define('banner_group', group);
+
+    function getGroupColor(key) {
+        let color = '';
+        group.forEach(item => {
+            if (item[key]) {
+                color = item[key];
+            }
+        });
+        return color;
+    }
+    style.define('getGroupColor', getGroupColor);
+}

package/source/css/_global/animation.styl

@@ -214,6 +214,12 @@
     transform translate3d(85px, 0, 0)
 
 @keyframes rowup
+  from
+    transform translateY(0)
+  to
+    transform translateY(-50%)
+
+@keyframes rowleft
   from
     transform translateX(0)
   to

package/source/css/_layout/basic.styl

@@ -296,4 +296,13 @@ b, strong
 .button--animated
   border-radius 8px
   transition .3s
-  position relative
+  position relative
+
+if hexo-config('fancybox')
+  a.fancybox
+    border-bottom 0
+    padding 0
+    margin auto
+    display contents
+    width fit-content
+    user-select none

package/source/css/_layout/header.styl

@@ -97,7 +97,7 @@
     transition 0.3s
     display flex
     justify-content center
-    -webkit-user-select none
+    user-select none
 
     +maxWidth768()
       background linear-gradient(to top, var(--sco-main-none) 0, var(--sco-main) 100%)
@@ -558,7 +558,7 @@
     font-size .78em
     cursor pointer
 
-  if hexo-config('nav.left.enable')
+  if hexo-config('nav.group')
     .back-home-button
       &:hover
         +minWidth900()
@@ -658,7 +658,7 @@
   transition .3s
   white-space nowrap
 
-if hexo-config('nav.left.enable')
+if hexo-config('nav.group')
   .back-home-button
     display flex
     width 35px
@@ -749,7 +749,7 @@ if hexo-config('nav.left.enable')
         +minWidth900()
           background var(--sco-lighttext)
 
-    if hexo-config('nav.left.enable')
+    if hexo-config('nav.group')
       .back-home-button
         color var(--sco-fontcolor)
 
@@ -767,7 +767,7 @@ if hexo-config('nav.left.enable')
             background-color var(--sco-main)
 
 .post
-  if hexo-config('nav.left.enable')
+  if hexo-config('nav.group')
     .back-home-button
       color var(--sco-white)
 

package/source/css/_layout/index.styl

@@ -30,7 +30,6 @@
     align-self flex-start
     animation slide-in .6s .1s backwards
     position relative
-    overflow hidden
 
     +maxWidth768()
       box-shadow none

package/source/css/_page/_about/skills.styl

@@ -16,7 +16,7 @@
       margin-top 20px
       display flex
       flex-wrap nowrap
-      animation rowup 60s linear infinite
+      animation rowleft 60s linear infinite
 
     .skills-style-group
       position relative

package/source/css/_page/_home/category-bar.styl

@@ -1,18 +1,18 @@
 #category-bar
-  padding: 0.4rem 1rem 0.4rem 0.7rem;
-  background: var(--sco-card-bg);
-  border-radius: 12px;
-  display: flex;
-  white-space: nowrap;
-  overflow: hidden;
-  margin-bottom: 1rem;
-  border: var(--style-border);
-  transition: 0.3s;
-  height: 50px;
-  width: 100%;
-  justify-content: space-between;
-  -webkit-user-select: none;
-  align-items: center;
+  padding 0.4rem 1rem 0.4rem 0.7rem
+  background var(--sco-card-bg)
+  border-radius 12px
+  display flex
+  white-space nowrap
+  overflow hidden
+  margin-bottom 1rem
+  border var(--style-border)
+  transition 0.3s
+  height 50px
+  width 100%
+  justify-content space-between
+  user-select none
+  align-items center
 
   +maxWidth1300()
     margin-bottom 1rem

package/source/css/_page/_home/home-top.styl

@@ -5,7 +5,7 @@
     overflow-x auto
     width 100%
     margin-bottom 0
-    -webkit-user-select none
+    user-select none
 
     +maxWidth768()
       border-radius 0
@@ -31,15 +31,27 @@
           flex-direction column
           justify-content space-between
 
+        .tags-group-wrapper
+          margin-top 0
+          display flex
+          flex-wrap wrap
+          animation rowup 60s linear infinite
+          width 300px
+          margin-left auto
+
+        .tags-group-icon-pair
+          display flex
+
+          .tags-group-icon:nth-child(even)
+            margin-left 4rem
+
         .categoryGroup
           display flex
           flex-direction column
           justify-content space-between
           min-width 200px
           +minWidth1200()
-            flex-direction row
-            height 24%
-            animation slide-in .6s .2s backwards
+            display none
           +maxWidth768()
             min-width 130px
             margin-bottom .5rem
@@ -59,22 +71,6 @@
               height 47%
               box-shadow none
 
-            &:nth-child(3)
-              display none
-            +minWidth1200()
-              width calc(100% / 3 - .33rem)
-              height 100%
-              margin-right .5rem
-
-              &:last-child
-                margin-right 0
-
-              &:hover
-                width 50%
-
-              &:nth-child(3)
-                display flex
-
             a.categoryButton
               height 100%
               width 100%
@@ -129,30 +125,6 @@
               .categoryButtonText
                 padding-left 21px
 
-              &.bikan
-                background linear-gradient(to right, #358bff, #15c6ff)
-                background-size 200%
-
-                [data-theme=dark] &
-                  background linear-gradient(to right, #0653b8, #2fcbff)
-                  background-size 200%
-
-              &.remen
-                background linear-gradient(to right, #f65, #ffbf37)
-                background-size 200%
-
-                [data-theme=dark] &
-                  background linear-gradient(to right, #e22a16, #da980c)
-                  background-size 200%
-
-              &.shiyong
-                background linear-gradient(to right, #18e7ae, #1eebeb)
-                background-size 200%
-
-                [data-theme=dark] &
-                  background linear-gradient(to right, #099e74, #0ea4a4)
-                  background-size 200%
-
   /.topGroup
     display: flex
 
@@ -340,4 +312,44 @@
             transform: scale(1.2)
 
           .banner-button-group
-            bottom: 1rem
+            bottom: 1rem
+
+.banners-links
+  display flex
+  position absolute
+  bottom 20px
+  left 40px
+  flex-direction column
+  justify-content space-between
+  flex-wrap wrap
+  height 120px
+
+.tags-group-icon-pair
+  margin-left 1rem
+  user-select none
+
+.banners-link-btn
+  display flex
+  flex-direction row
+  align-items center
+  padding 8px 18px 8px 14px
+  border-radius 60px
+  margin-bottom 12px
+  color var(--sco-white)
+  width 94px
+  position relative
+  background-size 200%
+
+  &:not(:last-child)
+    margin-right 10px
+
+  &:hover
+    background-position 100% 0
+
+.banners-link-title
+  margin-left auto
+
+for name in banner_group
+  .banners-link-{name}
+    background convert(getGroupColor(name))
+    background-size 200%

package/source/css/_page/_home/recent-post.styl

@@ -6,7 +6,7 @@
     justify-content space-between
     align-items flex-start
     align-content flex-start
-    -webkit-user-select none
+    user-select none
     transition width .3s
 
   +maxWidth768()

package/source/css/_page/equipment.styl

@@ -26,6 +26,7 @@
       box-shadow var(--sco-shadow-border)
       min-height 400px
       position relative
+      user-select none
 
       +maxWidth1200()
         width calc(50% - 12px)
@@ -56,11 +57,11 @@
           white-space nowrap
           overflow hidden
           text-overflow ellipsis
-          cursor pointer
           width fit-content
 
           &:hover
-            color var(--sco-main)
+            color var(--sco-vip)
+            cursor pointer
 
         .equipment-item-content-item-specification
           font-size 12px

package/source/css/_page/home.styl

@@ -15,21 +15,6 @@
   > div:not(.author-content-item)
     animation slide-in .6s .2s backwards
 
-.tags-group-icon
-  width: 120px
-  height: 120px
-  border-radius: 30px
-  display: flex
-  align-items: center
-  justify-content: center
-  color: #fff
-  font-size: 66px
-  font-weight: 700
-  box-shadow: var(--sco-shadow-blackdeep)
-
-  img
-    width: 60%
-
 +minWidth768()
   > div:nth-child(1) > a::before
     height: 24px

package/source/css/_page/links.styl

@@ -82,7 +82,6 @@
         width calc(50% - 16px)
 
       .img
-        -webkit-mask-image -webkit-radial-gradient(center, #fff, #000)
         border-radius 0
         height 120px
         width 100%
@@ -91,17 +90,16 @@
         padding 0
         transition all .3s ease 0s
         overflow hidden
-        background-color #f6f6f6
 
         img
-          width 100%
-          height 100%
-          object-fit cover
           border-radius 0
           transform scale(1.03)
           transition .3s
           margin 0
           max-width 100%
+          width 100%
+          height 100%
+          object-fit cover
 
       .img-alt
         display none
@@ -158,18 +156,21 @@
         box-shadow var(--sco-shadow-main)
 
         .site-card-tag
-          left: -80px
+          left: -60px
 
         .img
           height 80px
+          transform scale(1.1)
+          filter brightness(.3)
+          border-radius 12px
+          background var(--sco-lighttext)
 
           img
+            border-radius 12px
             transform scale(1.1)
             filter brightness(.3)
-            cursor pointer
 
         a
-          border-bottom 2px solid var(--sco-none)
           color var(--sco-white)
           background var(--sco-main)
           box-shadow var(--sco-shadow-main)

package/source/css/_page/says.styl

@@ -11,7 +11,7 @@ if hexo-config('says.home_mini')
     height 50px
     width 100%
     justify-content space-between
-    -webkit-user-select none
+    user-select none
     align-items center
     padding .5rem 1rem
 
@@ -108,7 +108,6 @@ if hexo-config('says.enable')
         display flex
         justify-content space-between
         width 100%
-        -webkit-user-select none
         user-select none
 
       .bber-info