feat: 當設置aside mobile為false時，toc仍然能顯示

fix: 修復resize 時，toc 的位置問題 fix: 修復當aside mobile設為false時，文章頁 js報錯的bugs close jerryc127#444
laugh0608 · Dec 11, 2020 · 6fda7ef · 6fda7ef
1 parent ecca262
commit 6fda7ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/layout/includes/rightside.pug b/layout/includes/rightside.pug
@@ -21,7 +21,7 @@
       if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size)
         button#rightside_config(type="button" title=_p("rightside.setting"))
           i.fas.fa-cog.fa-spin
-      if showToc && theme.aside.mobile
+      if showToc
         button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
           i.fas.fa-list-ul
     else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "3.4.0-b5",
+  "version": "3.4.0-b6",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

diff --git a/source/css/_global/function.styl b/source/css/_global/function.styl
@@ -37,8 +37,8 @@ maxWidth900()
   @media screen and (max-width: 900px)
     {block}
 
-maxWidth901()
-  @media screen and (max-width: 900px)
+minWidth901()
+  @media screen and (min-width: 901px)
     {block}
 
 minWidth900()

diff --git a/source/css/_layout/aside.styl b/source/css/_layout/aside.styl
@@ -10,10 +10,6 @@
   +maxWidth900()
     width: 100%
 
-  if hexo-config('aside.mobile') == false
-    +maxWidth768()
-      display: none
-
   > .card-widget:first-child
     margin-top: 0
 
@@ -32,6 +28,11 @@
     &:hover
       box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
 
+    if hexo-config('aside.mobile') == false
+      +maxWidth768()
+        &:not(#card-toc)
+          display: none
+
   .card-info
     img
       width: 110px