Merge pull request #174 from valor-x/dev

v1.5.7
everfu · Mar 19, 2024 · 5e27d77 · 5e27d77
2 parents 91361c8 + 3b113a5
commit 5e27d77
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 26 deletions.
diff --git a/layout/includes/inject/head.pug b/layout/includes/inject/head.pug
@@ -78,7 +78,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.6",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.7",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"

diff --git a/layout/includes/page/says.pug b/layout/includes/page/says.pug
@@ -24,7 +24,7 @@ if theme.says.enable
 
                         if item.aplayer
                             .bber-music
-                                meting-js(server=item.aplayer.server type="song" id=item.aplayer.id mutex="true" preload="none" theme="var(--st-main)" data-lrctype="0")
+                                meting-js(server=item.aplayer.server type="song" id=item.aplayer.id mutex="true" preload="none" theme="var(--efu-main)" data-lrctype="0")
 
                         if item.video
                             .bber-video

diff --git a/layout/includes/widgets/page/about/award.pug b/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(--st-vip);color: var(--st-white)" : ""))
+                            .reward-list-item-money(style=(reward.vip ? "background: var(--efu-vip);color: var(--efu-white)" : ""))
                                 if reward.icon
                                     i.solitude(class=reward.icon)
                                 | ¥ #{reward.money}

diff --git a/layout/includes/widgets/third-party/music.pug b/layout/includes/widgets/third-party/music.pug
@@ -1,3 +1,3 @@
 div.needEndHide#nav-music(onclick="sco.musicToggle()")
     div#nav-music-hoverTips=__('music.hit')
-    meting-js(id=theme.capsule.id, server=theme.capsule.server, type="playlist", mutex="true", preload="none", data-lrctype="0", order="random", theme="var(--st-main)")
+    meting-js(id=theme.capsule.id, server=theme.capsule.server, type="playlist", mutex="true", preload="none", data-lrctype="0", order="random", theme="var(--efu-main)")
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the wleelw",
   "main": "package.json",
   "scripts": {

diff --git a/source/css/_page/_about/author.styl b/source/css/_page/_about/author.styl
@@ -65,23 +65,8 @@
       &:hover
         transform scale(1.1)
 
-      +maxWidth768()
-        width 120px
-        height 120px
-
-        &::before
-          bottom -5px
-          right -5px
-
-      img
-        border-radius 200px
-
       &::before
         content ''
-        -webkit-transition 1s
-        -moz-transition 1s
-        -o-transition 1s
-        -ms-transition 1s
         transition 1s
         width 30px
         height 30px
@@ -91,4 +76,17 @@
         border 5px solid var(--efu-background)
         bottom 5px
         right 10px
-        z-index 2
+        z-index 2
+
+      +maxWidth768()
+        width 120px
+        height 120px
+
+        &::before
+          bottom -2px
+          right -2px
+          width 20px
+          height 20px
+
+      img
+        border-radius 200px
diff --git a/source/css/_page/_home/home-top.styl b/source/css/_page/_home/home-top.styl
@@ -21,9 +21,9 @@
         display none
 
       / #bannerGroup
-        display flex
+        display none
 
-        +minWidth1200()
+        +minWidth1201()
           width calc(50% - .25rem)
           margin-right .5rem
           height calc(328px + .5rem)
@@ -50,7 +50,7 @@
           flex-direction column
           justify-content space-between
           min-width 200px
-          +minWidth1200()
+          +minWidth1201()
             display none
           +maxWidth768()
             min-width 130px
@@ -216,7 +216,7 @@
     .todayCard
       display none
 
-      +minWidth1200()
+      +minWidth1201()
         position absolute
         width 100%
         z-index 3

diff --git a/source/js/utils.js b/source/js/utils.js
@@ -70,7 +70,7 @@ const utils = {
     snackbarShow: (text, showAction, duration) => {
         const sa = (typeof showAction !== 'undefined') ? showAction : false
         const dur = (typeof duration !== 'undefined') ? duration : 5000
-        document.styleSheets[0].addRule(':root', '--st-snackbar-time:' + dur + 'ms!important')
+        document.styleSheets[0].addRule(':root', '--efu-snackbar-time:' + dur + 'ms!important')
         Snackbar.show({
             text: text, showAction: sa, duration: dur, pos: 'top-center'
         })