Fix several bugs reported in v7.3 (theme-next#1060)

tongluyang · Aug 9, 2019 · f98ce5f · f98ce5f
1 parent 8aa162c
commit f98ce5f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/source/css/_common/components/highlight/copy-code.styl b/source/css/_common/components/highlight/copy-code.styl
@@ -50,11 +50,6 @@ if (hexo-config('codeblock.copy_button.style') == 'mac') {
     box-shadow: 0 10px 30px 0 rgba(0, 0, 0, .4);
     margin-bottom: 1.6em;
     padding-top: 30px;
-  }
-
-  .highlight {
-    // border-radius: 0 0 5px 5px;
-    margin: 0 !important;
 
     &::before {
       background: #fc625d;
@@ -68,4 +63,9 @@ if (hexo-config('codeblock.copy_button.style') == 'mac') {
       width: 12px;
     }
   }
+
+  .highlight {
+    // border-radius: 0 0 5px 5px;
+    margin: 0 !important;
+  }
 }
diff --git a/source/css/_common/components/highlight/highlight.styl b/source/css/_common/components/highlight/highlight.styl
@@ -34,6 +34,7 @@ pre {
   code {
     background: none;
     color: $highlight-foreground;
+    font-size: $table-font-size;
     padding: 0;
     text-shadow: none;
   }

diff --git a/source/css/_common/components/post/post-title.styl b/source/css/_common/components/post/post-title.styl
@@ -10,6 +10,7 @@
       color: #bbb;
       display: inline-block;
       float: right;
+      font-size: $font-size-larger;
       the-transition-ease-in();
       margin-left: -1.2em;
 

diff --git a/source/css/_common/components/sidebar/sidebar-button.styl b/source/css/_common/components/sidebar/sidebar-button.styl
@@ -2,21 +2,21 @@
   margin-top: 10px;
 
   a {
-    border: 1px solid rgb(252, 100, 35) !important;
+    border: 1px solid $orange !important;
     border-radius: 4px;
-    color: rgb(252, 100, 35);
+    color: $orange;
     display: inline-block;
     padding: 0 15px;
 
-    i {
-      color: rgb(252, 100, 35);
+    .fa {
+      margin-right: 5px;
     }
 
     &:hover {
-      background: rgb(252, 100, 35);
+      background: $orange;
       color: white;
 
-      i {
+      .fa {
         color: white;
       }
     }

diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl
@@ -66,7 +66,7 @@
       background: none;
       color: darken($orange, 20%);
 
-      i {
+      .fa {
         color: darken($orange, 20%);
       }
     }

diff --git a/source/js/utils.js b/source/js/utils.js
@@ -163,7 +163,9 @@ NexT.utils = {
   registerActiveMenuItem: function() {
     $('.menu-item').each(function() {
       var target = $(this).find('a[href]')[0];
-      if (target.hostname === location.hostname && (target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', '', 'g'))) {
+      var isSamePath = target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', '');
+      var isSubPath = target.pathname !== '/' && location.pathname.indexOf(target.pathname) === 0;
+      if (target.hostname === location.hostname && (isSamePath || isSubPath)) {
         $(this).addClass('menu-item-active');
       } else {
         $(this).removeClass('menu-item-active');
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,7 @@ @@
           background: none;
           color: darken($orange, 20%);
-          i {
+          .fa {
             color: darken($orange, 20%);
           }
         }
@@ Expand Down @@