hexo-theme-solitude 1.3.0 → 1.4.0

package/scripts/event/cdn.js

@@ -0,0 +1,129 @@
+/**
+ * Solitude
+ * Merge CDN
+ */
+
+'use strict'
+
+const { version } = require('../../package.json')
+const path = require('path')
+
+hexo.extend.filter.register('before_generate', () => {
+    const themeConfig = hexo.theme.config
+    const { CDN } = themeConfig
+
+    const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' })
+    const internalSrc = {
+        main: {
+            name: 'hexo-theme-solitude',
+            file: 'js/main.js',
+            version
+        },
+        utils: {
+            name: 'hexo-theme-solitude',
+            file: 'js/utils.js',
+            version
+        },
+        local_search: {
+            name: 'hexo-theme-solitude',
+            file: 'js/search/local.js',
+            version
+        },
+        algolia_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/search/algolia.js',
+            version
+        },
+        cover_local: {
+            name: 'hexo-theme-solitude',
+            file: 'js/covercolor/local.js',
+            version
+        },
+        cover_api: {
+            name: 'hexo-theme-solitude',
+            file: 'js/covercolor/api.js',
+            version
+        },
+        rightside_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/rightside.js',
+            version
+        },
+        music_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/music.js',
+            version
+        },
+        sco_ai_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/sco-ai.min.js',
+            version
+        },
+        twikoo_commentBarrage: {
+            name: 'hexo-theme-solitude',
+            file: 'js/comment/twikoo_commentBarrage.js',
+            version
+        },
+        waline_commentBarrage: {
+            name: 'hexo-theme-solitude',
+            file: 'js/comment/waline_commentBarrage.js',
+            version
+        },
+    }
+
+    const minFile = file => {
+        return file.replace(/(?<!\.min)\.(js|css)$/g, ext => '.min' + ext)
+    }
+
+    const createCDNLink = (data, type, cond = '') => {
+        Object.keys(data).forEach(key => {
+            let { name, version, file, other_name } = data[key]
+            const cdnjs_name = other_name || name
+            const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '')
+            const min_cdnjs_file = minFile(cdnjs_file)
+            if (cond === 'internal') file = `source/${file}`
+            const min_file = minFile(file)
+            const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : ''
+
+            const value = {
+                version,
+                name,
+                file,
+                cdnjs_file,
+                min_file,
+                min_cdnjs_file,
+                cdnjs_name
+            }
+
+            const cdnSource = {
+                local: cond === 'internal' ? `${cdnjs_file + verType}` : `/pluginsSrc/${name}/${file + verType}`,
+                jsdelivr: `https://cdn.jsdelivr.net/npm/${name}${verType}/${min_file}`,
+                unpkg: `https://unpkg.com/${name}${verType}/${file}`,
+                cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
+                custom: (CDN.custom_format || '').replace(/\$\{(.+?)\}/g, (match, $1) => value[$1]),
+                custom_cdn: `${CDN.custom_cdn + cdnjs_file}`,
+                cdncbd: `https://cdn.cbd.int/${name}${verType}/${file}`,
+            }
+
+            data[key] = cdnSource[type]
+        })
+
+        if (cond === 'internal') data.main_css = 'css/index.css' + (CDN.version ? `?v=${version}` : '')
+        return data
+    }
+
+    // delete null value
+    const deleteNullValue = obj => {
+        if (!obj) return
+        for (const i in obj) {
+            obj[i] === null && delete obj[i]
+        }
+        return obj
+    }
+
+    themeConfig.cdn = Object.assign(
+        createCDNLink(internalSrc, CDN.internal, 'internal'),
+        createCDNLink(thirdPartySrc, CDN.third_party),
+        deleteNullValue(CDN.option)
+    )
+})

package/scripts/event/page.js

@@ -1,11 +1,10 @@
-
+// generate 404 Page
 hexo.extend.generator.register('404', function (locals) {
   if(!this.theme.config.page.error)return
   return {
     path: '404.html',
     layout: ['404'],
     data: {
-      title: '404',
       type: '404',
       comment: false
     }
@@ -15,12 +14,10 @@ hexo.extend.generator.register('404', function (locals) {
 // generate tags Page
 hexo.extend.generator.register('tags', function(locals) {
   if(!this.theme.config.page.tags)return
-  const lang = hexo.theme.i18n.get(this.config.language || 'zh-CN')
   return {
     path: 'tags/index.html',
     layout: ['page'],
     data: {
-      title: lang["page.tag"],
       type: 'tags',
       comment: false
     }
@@ -30,29 +27,12 @@ hexo.extend.generator.register('tags', function(locals) {
 // generate categories Page
 hexo.extend.generator.register('categories', function(locals) {
   if(!this.theme.config.page.categories)return
-  const lang = hexo.theme.i18n.get(this.config.language || 'zh-CN')
   return {
     path: 'categories/index.html',
     layout: ['page'],
     data: {
-      title: lang["page.category"],
       type: 'categories',
       comment: false
     }
   };
-});
-
-// generate echarts Page
-hexo.extend.generator.register('echarts', function(locals) {
-  if(!this.theme.config.about.echarts && !this.theme.config.about.enable)return
-  const lang = hexo.theme.i18n.get(this.config.language || 'zh-CN')
-  return {
-    path: 'echart/index.html',
-    layout: ['page'],
-    data: {
-      title: lang["page.echarts"],
-      type: 'echarts',
-      comment: false
-    }
-  };
 });

package/scripts/event/welcome.js

@@ -9,6 +9,6 @@ hexo.on('ready', () => {
       ######  ####  ##### #####    #      ###   ######   ######
                             ${version}
   ===================================================================
-  主题链接：https://github.com/DuoSco/Hexo-theme-solitude
+  主题链接：https://github.com/wleelw/Hexo-theme-solitude
   `)
 })

package/scripts/filter/lazyload.js

@@ -8,4 +8,4 @@ hexo.extend.filter.register('after_render:html', function (data) {
         /(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*? src=)/gi,
         `$1 "${bg}" data-lazy-src=`
     )
-})
+})

package/source/css/_global/function.styl

@@ -1,83 +1,83 @@
 maxWidth600()
-	@media screen and (max-width: 600px)
-		{block}
+  @media screen and (max-width: 600px)
+    {block}
 
 maxWidth768()
-	@media screen and (max-width: 768px)
-		{block}
+  @media screen and (max-width: 768px)
+    {block}
 
 minWidth768()
-	@media screen and (min-width: 768px)
-		{block}
+  @media screen and (min-width: 768px)
+    {block}
 
 maxWidth798()
-	@media screen and (max-width: 798px)
-		{block}
+  @media screen and (max-width: 798px)
+    {block}
 
 minWidth798()
-	@media screen and (min-width: 798px)
-		{block}
+  @media screen and (min-width: 798px)
+    {block}
 
 maxWidth899()
-	@media screen and (max-width: 899px)
-		{block}
+  @media screen and (max-width: 899px)
+    {block}
 
 minWidth899()
-	@media screen and (min-width: 899px)
-		{block}
+  @media screen and (min-width: 899px)
+    {block}
 
 maxWidth900()
-	@media screen and (max-width: 900px)
-		{block}
+  @media screen and (max-width: 900px)
+    {block}
 
 minWidth900()
-	@media screen and (min-width: 900px)
-		{block}
+  @media screen and (min-width: 900px)
+    {block}
 
 maxWidth1300()
-	@media screen and (max-width: 1300px)
-		{block}
+  @media screen and (max-width: 1300px)
+    {block}
 
 minWidth1300()
-	@media screen and (min-width: 1300px)
-		{block}
+  @media screen and (min-width: 1300px)
+    {block}
 
 maxWidth1400()
-	@media screen and (max-width: 1400px)
-		{block}
+  @media screen and (max-width: 1400px)
+    {block}
 
 minWidth1400()
-	@media screen and (min-width: 1400px)
-		{block}
+  @media screen and (min-width: 1400px)
+    {block}
 
 maxWidth1200()
-	@media screen and (max-width: 1200px)
-		{block}
+  @media screen and (max-width: 1200px)
+    {block}
 
 minWidth1200()
-	@media screen and (min-width: 1200px)
-		{block}
+  @media screen and (min-width: 1200px)
+    {block}
 
 maxWidth1024()
-	@media screen and (max-width: 1024px)
-		{block}
+  @media screen and (max-width: 1024px)
+    {block}
 
 maxWidth900()
-	@media screen and (max-width: 900px)
-		{block}
+  @media screen and (max-width: 900px)
+    {block}
 
 minWidth901()
-	@media screen and (min-width: 901px)
-		{block}
+  @media screen and (min-width: 901px)
+    {block}
 
 minWidth900()
-	@media screen and (min-width: 900px)
-		{block}
+  @media screen and (min-width: 900px)
+    {block}
 
 minWidth2000()
-	@media screen and (min-width: 2000px)
-		{block}
+  @media screen and (min-width: 2000px)
+    {block}
 
 maxHeight800()
-	@media screen and (max-height: 800px)
-		{block}
+  @media screen and (max-height: 800px)
+    {block}

package/source/css/_global/index.styl

@@ -9,7 +9,7 @@
   --sco-cyan #00bcd4
   --sco-cyan-op #00bcd42b
   --sco-vip #e5a80d
-  --sco-life #57bd6a
+  --sco-speed #57bd6a
   --sco-main var(--sco-theme)
   --sco-main-op var(--sco-theme-op)
   --sco-main-op-deep var(--sco-theme-op-deep)

package/source/css/_layout/basic.styl

@@ -24,8 +24,8 @@ body
   margin 0
 
 ::selection
-  background var(--sco-fontcolor)
-  color var(--sco-background)
+  background var(--sco-main)
+  color var(--sco-white)
 
 i.scoicon
   font-size 22px
@@ -59,6 +59,9 @@ a
   overflow-wrap break-word
   -webkit-user-drag none
 
+  &:hover
+    color var(--sco-lighttext)
+
 abbr[title]
   border-bottom none
   text-decoration underline dotted
@@ -95,7 +98,7 @@ button, input
   overflow visible
 
 input::placeholder
-  color var(--sco-gray) !important
+  color var(--sco-gray)
 
 button, select
   text-transform none
@@ -179,10 +182,6 @@ table td, table th
   border 1px solid var(--light-grey)
   vertical-align middle
 
-::selection
-  background #0079ff
-  color #f7f7f7
-
 button
   padding 0
   outline 0
@@ -192,9 +191,11 @@ button
   cursor pointer
 
 img
-  max-width 100%
-  transition all .2s ease 0s;
   border-style none
+  border-radius 8px
+  max-width 100%
+  transition all .2s ease 0s
+  -webkit-user-drag none
 
 img:not([src]), img[src=""]
   opacity 0
@@ -205,9 +206,6 @@ img:not([src]), img[src=""]
   margin-top 8px
   color var(--sco-secondtext)
 
-.img-alt:hover
-  text-decoration none !important
-
 .is-center
   text-align center
   display flex

package/source/css/_layout/header.styl

@@ -332,7 +332,7 @@
     transition .3s
     display flex
     height 35px
-    min-width 70px
+    min-width 50px
     justify-content center
     align-items center
     border-radius 40px
@@ -375,7 +375,12 @@
           transition all .3s, color 0s, opacity .3s
 
     if hexo-config('site.name.class') == text
-      span
+      span.title
+        letter-spacing normal
+        font-size 1rem
+        font-weight 700
+        padding 0 5px
+        line-height 2rem
         +maxWidth768()
           padding-left 8px
 
@@ -464,7 +469,7 @@
           border-radius 5px
           margin 0 4px
 
-          a
+          #page-header & a
             letter-spacing 0
             display flex
             align-items center

package/source/css/_layout/index.styl

@@ -19,21 +19,22 @@
     width calc(100% - 300px)
 
     +maxWidth1200()
-      width 100% !important
+      width 100%
 
   > div:first-child:not(.recent-posts)
     box-shadow var(--sco-shadow-border)
     padding 1rem 2rem
     border-radius 12px
-    width calc(100% - 300px)
-    background var(--sco-card-bg);
-    border var(--style-border);
+    background var(--sco-card-bg)
+    border var(--style-border)
     align-self flex-start
     animation slide-in .6s .1s backwards
     position relative
     overflow hidden
 
     +maxWidth768()
+      box-shadow none
+      border none
       padding 0 1rem
       background var(--sco-background)
 
@@ -41,6 +42,7 @@ span.tags-punctuation::before
   content: "\e071"
   font-family: scoicon, serif !important
   font-size: 12px
+  transition none
   margin-right: 2px
   opacity: .4
 
@@ -49,4 +51,56 @@ span.tags-punctuation::before
 
   #post-info &
     font-size 14px
-    line-height 32px
+    line-height 32px
+
+// snackbar
+.snackbar-container 
+  background var(--sco-lighttext)!important
+  color var(--sco-card-bg)!important
+  border-radius 0!important
+  display flex
+  justify-content center!important
+  max-width none!important
+  min-width 100%!important
+  margin 0!important
+  left 0!important
+  height 60px!important
+  transform none!important
+
+.snackbar-container p 
+  color var(--sco-card-bg)!important
+  font-weight 700!important
+  text-align center!important
+  font-size .8rem!important
+  display flex!important
+  justify-content center!important
+
+.snackbar-container .action 
+  color var(--sco-card-bg)!important
+  background var(--sco-lighttext)!important
+  padding 4px 6px!important
+  font-weight 700
+  border-radius 8px!important
+  transition .3s
+  border var(--style-border)!important
+.snackbar-container .action:hover 
+  color var(--sco-lighttext)!important
+  background var(--sco-card-bg)!important
+
+.snackbar-container::after 
+  position absolute
+  width 0
+  height 100%
+  left 0
+  top 0
+  background var(--sco-white)
+  opacity .1
+  content ""
+  animation snackbar-progress var(--sco-snackbar-time) linear forwards
+  pointer-events none
+
+@keyframes snackbar-progress 
+  from 
+    width 0
+  to 
+    width 100%

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

@@ -337,55 +337,32 @@ div#banners
       display flex
       flex-direction row
       flex-wrap wrap
-      height calc(328px + .5rem)
+      justify-content space-between
+      height calc(328px + 0.5rem)
       align-content space-between
       width calc(50% - 0.25rem)
       position relative
       animation slide-in .6s .1s backwards
-      overflow-x visible
-      gap 0.5rem
 
     .recent-post-item
       display flex
-      width 200px
       flex-direction column
+      width calc(100% / 3 - 0.25rem)
       align-items flex-start
-      margin-left .5rem
       background var(--sco-card-bg)
       border-radius 12px
       overflow hidden
-      min-width 200px
       height 164px
       max-height 164px
       border var(--style-border-always)
       transition .3s
       position relative
       box-shadow var(--sco-shadow-border)
-      +minWidth1300()
-        width calc(100% / 3 - 0.35rem)
-        margin-left 0
 
-      +minWidth1200()
-        display flex
-        width calc(100% / 3 - 0.35rem)
-        flex-direction column
-        align-items flex-start
-        margin-left 0
-        background var(--sco-card-bg)
-        border-radius 12px
-        overflow hidden
+      +maxWidth1200()
+        width 200px
         min-width 200px
-        height 164px
-        max-height 164px
-        border var(--style-border-always)
-        transition .3s
-        position relative
-        box-shadow var(--sco-shadow-border)
-
-      +maxWidth768()
-        border-radius 8px
-        box-shadow none
-        clip-path inset(0 0 0 0 round 8px)
+        margin-left .5rem
 
         &:last-child
           margin-right 1rem
@@ -395,7 +372,6 @@ div#banners
 
       .post_cover
         width 100%
-        -webkit-mask-image -webkit-radial-gradient(center, #fff, #000)
 
         a
           height 100px
@@ -421,7 +397,7 @@ div#banners
             transition .3s
             cursor pointer
 
-      .recent-post-info
+      /.recent-post-info
         padding .3rem .5rem .3rem .5rem
         transition .3s
 
@@ -438,6 +414,9 @@ div#banners
           font-size .8rem
           padding 0
 
+          &:hover
+            color var(--sco-fontcolor)
+
 
     .todayCard
       display none