🎨 Merge branch 'develop'

assets/css/_common/scaffolding/base.scss

@@ -18,7 +18,6 @@ body {
   position: relative;
   transition: padding $transition-ease;
 
-  @if $cfg_bd_scrollbar_overlay {
     overflow-x: hidden;
     @supports (overflow-x: clip) {
       overflow-x: clip;
@@ -26,7 +25,6 @@ body {
     width: 100vw;
   }
 
-  @if $cfg_bd_scrollbar_stable {
     overflow-y: scroll;
   }
 }

assets/css/_common/scaffolding/comments.scss

@@ -37,3 +37,119 @@
     padding-top: 0;
   }
 }
+
+.post-comments {
+  @if $scheme !='Gemini' {
+    margin-top: 60px;
+  }
+
+  overflow: hidden;
+
+  .comment-head {
+    margin-bottom: 20px;
+
+    .comment-headline {
+      display: inline-block;
+      vertical-align: middle;
+      font-weight: 700;
+      font-size: 1.4em;
+    }
+
+    @if $two_comments_enable {
+      .comment-switch {
+        display: inline-block;
+        float: right;
+        margin: 2px auto;
+        padding: 4px 16px;
+        width: max-content;
+        border-radius: 8px;
+        background: #eee;
+
+        .first-comment {
+          color: $first_comment_color;
+
+          @if $two_comments_actived==$first_comment_name {
+            font-weight: bold;
+          }
+        }
+
+        .second-comment {
+          color: $second_comment_color;
+
+          @if $two_comments_actived==$second_comment_name {
+            font-weight: bold;
+          }
+        }
+
+        $switch_btn_bg_color: $first_comment_color;
+
+        .switch-btn {
+          position: relative;
+          display: inline-block;
+          margin: -4px 8px 0;
+          width: 42px;
+          height: 22px;
+          border-radius: 34px;
+          vertical-align: middle;
+          cursor: pointer;
+          -webkit-transition: .4s;
+          -moz-transition: .4s;
+          -o-transition: .4s;
+          -ms-transition: .4s;
+          transition: .4s;
+
+          @if $two_comments_actived==$second_comment_name {
+            $switch_btn_bg_color: $second_comment_color;
+          }
+
+          background-color: $switch_btn_bg_color;
+
+          &:before {
+            position: absolute;
+            bottom: 4px;
+            left: 4px;
+            width: 14px;
+            height: 14px;
+            border-radius: 50%;
+            content: '';
+            background-color: #fff;
+            -webkit-transition: .4s;
+            -moz-transition: .4s;
+            -o-transition: .4s;
+            -ms-transition: .4s;
+            transition: .4s
+          }
+
+          &.move:before {
+            -webkit-transform: translateX(20px);
+            -moz-transform: translateX(20px);
+            -o-transform: translateX(20px);
+            -ms-transform: translateX(20px);
+            transform: translateX(20px);
+          }
+        }
+      }
+    }
+  }
+
+  @if $two_comments_enable {
+    $first_comment_display: none;
+    $second_comment_display: none;
+
+    @if $two_comments_actived==$first_comment_name {
+      $first_comment_display: block;
+    }
+
+    @if $two_comments_actived==$second_comment_name {
+      $second_comment_display: block;
+    }
+
+    .comment-wrap>div:nth-child(1) {
+      display: $first_comment_display;
+    }
+
+    .comment-wrap>div:nth-child(2) {
+      display: $second_comment_display;
+    }
+  }
+}

assets/css/_common/scaffolding/fontawesome/animation.scss

@@ -0,0 +1,4 @@
+.fa-spin {
+  -webkit-animation: fa-spin .8s infinite linear;
+  animation: fa-spin .8s infinite linear;
+} 

assets/css/_common/scaffolding/fontawesome/index.scss

@@ -0,0 +1 @@
+@import 'animation';

assets/css/_common/scaffolding/highlight/copy-code.scss

@@ -11,13 +11,11 @@
   position: absolute;
   transition: opacity $transition-ease;
 
-  @if $cfg_codeblock_copy_btn_style == 'flat' {
     background: white;
     border: 0;
     font-size: $font-size-smaller;
     right: 0;
     top: 0;
-  } @else if $cfg_codeblock_copy_btn_style == 'mac' {
     color: var(--highlight-foreground);
     font-size: 14px;
     right: 0;
@@ -33,7 +31,6 @@
   }
 }
 
-@if $cfg_codeblock_copy_btn_style == 'mac' {
   figure.highlight {
     border-radius: 5px;
     box-shadow: 0 10px 30px 0 rgba(0, 0, 0, .4);

assets/css/_common/scaffolding/highlight/index.scss

@@ -1,13 +1,8 @@
 // Use `@use` to fix issue #67
-// TODO Not understand how to import dymatic variable
 // @import '(theme.highlight.enable && theme.highlight.light.file) ? theme.highlight.light.file : null';
 // @import '(theme.prism.enable && theme.prism.light) ? theme.prism.light : null';
 // @import '(theme.prism.enable && theme.prism.number) ? theme.prism.number : null';
 
-// @media (prefers-color-scheme: dark) {
-  // @import '(theme.darkmode && theme.highlight.enable && theme.highlight.dark.file) ? theme.highlight.dark.file : null';
-  // @import '(theme.darkmode && theme.prism.enable && theme.prism.dark) ? theme.prism.dark : null';
-// }
 
 // @import 'theme.codeblock.copy_button.enable ? "copy-code" : null';
 
@@ -43,6 +38,7 @@
 
 pre, code {
   font-family: $code-font-family;
+  color: #fff;
 }
 
 code {
@@ -61,6 +57,7 @@ kbd {
   font-family: inherit;
   padding: .1em .3em;
   white-space: nowrap;
+  color: #fff;
 }
 
 // `highlight.line_number: false` and `highlight.wrap: false`

assets/css/_common/scaffolding/index.scss

@@ -10,3 +10,4 @@
 @import 'tags';
 @import 'pagination';
 @import 'comments';
+@import 'fontawesome';

assets/css/_common/scaffolding/tags/mermaid.scss

@@ -1,4 +1,4 @@
-@if $cfg_mermaid_enable {
+@if $mermaid_enable {
   .mermaid {
     margin-bottom: 20px;
     text-align: center;

assets/css/_common/scaffolding/tags/note.scss

@@ -1,9 +1,9 @@
 //@use 'sass:map';
 
-@if $cfg_note_style != 'disabled' {
+@if $note_style != 'disabled' {
   .post-body .note {
-    $note-icons : $cfg_note_icons;
-    $note-style : $cfg_note_style;
+    $note-icons : $note_icons;
+    $note-style : $note_style;
 
     border-radius: $note-border-radius;
     margin-bottom: 20px;
@@ -68,7 +68,6 @@
       &.#{$type} {
         @if $note-style == 'flat' {
           background: map-get($note-bg, $type);
-          @if $cfg_darkmode {
             @media (prefers-color-scheme: dark) {
               background: mix(map-get($note-bg, $type), $body-bg-color-dark, 10%);
             }

assets/css/_common/scaffolding/tags/pdf.scss

@@ -1,7 +1,7 @@
-@if $cfg_pdf_enable {
+@if $pdf_enable {
   .pdfobject-container {
     iframe, embed {
-      height: convert($cfg_pdf_height);
+      height: $pdf_height;
       width: 100%;
     }
   }

assets/css/_common/scaffolding/tags/tabs.scss

@@ -42,7 +42,6 @@
         border-radius: $tbr;
       }
 
-      @if $cfg_tabs_trans_tabs {
         transition: all $transition-ease-out;
       }
 
@@ -57,7 +56,6 @@
           width: (18em / 14);
         }
 
-        @if $cfg_tabs_trans_labels {
           transition: all $transition-ease-out;
         }
       }

assets/css/_common/scaffolding/toggles.scss

@@ -18,9 +18,7 @@
 }
 
 .toggle.toggle-arrow {
-  @include toggle-arrow($cfg_sidebar_position);
 }
 
 .toggle.toggle-close {
-  @include toggle-close($cfg_sidebar_position);
 }