From fd65f4fbd971360ceeee89f85071299f0fbc9b09 Mon Sep 17 00:00:00 2001
From: Cell <1024@lruihao.cn>
Date: Tue, 1 Mar 2022 12:13:01 +0800
Subject: [PATCH] :art: Style: add github dark dimmed highlight style (#43)

---
 assets/css/_partial/_single/_code.scss | 251 +++++++++++++------------
 assets/css/_variables.scss             | 142 +++++++-------
 exampleSite/content/tests/highlight.md |   2 +-
 3 files changed, 208 insertions(+), 187 deletions(-)

diff --git a/assets/css/_partial/_single/_code.scss b/assets/css/_partial/_single/_code.scss
index ff149afc..3d0b010b 100644
--- a/assets/css/_partial/_single/_code.scss
+++ b/assets/css/_partial/_single/_code.scss
@@ -2,16 +2,16 @@
 code {
   display: inline-block;
   max-width: 100%;
-  padding: 0 .4rem;
+  padding: 0 0.4rem;
   font-size: $code-font-size;
   font-family: $code-font-family;
   color: $code-color;
   background-color: #afb8c133;
-  border-radius: $global-border-radius;;
+  border-radius: $global-border-radius;
   @include overflow-wrap(break-word);
   @include line-break(anywhere);
 
-  [theme=dark] & {
+  [theme='dark'] & {
     color: $code-color-dark;
   }
 }
@@ -19,8 +19,8 @@ code {
 // indented code
 pre {
   margin: 0;
-  line-height: 1.45;
-  padding: .5rem;
+  line-height: 1.45em;
+  padding: 0.5rem;
   overflow: auto;
   font-size: $code-font-size;
   font-family: $code-font-family;
@@ -29,7 +29,7 @@ pre {
 
   background: $code-background-color;
 
-  [theme=dark] & {
+  [theme='dark'] & {
     background: $code-background-color-dark;
   }
 
@@ -47,7 +47,8 @@ pre {
   }
 }
 
-.highlight, .gist {
+.highlight,
+.gist {
   font-size: $code-font-size;
   font-family: $code-font-family;
 
@@ -66,7 +67,7 @@ pre {
 
 // block fenced code
 .highlight {
-  margin: .5rem 0;
+  margin: 0.5rem 0;
 
   > .chroma {
     position: relative;
@@ -79,14 +80,15 @@ pre {
       width: 100%;
       font-family: $global-font-family;
       font-weight: bold;
+      line-height: 1.4em;
       border-radius: $global-border-radius;
       color: $code-info-color;
-      background: darken($code-background-color, 8%);
+      background: darken($code-background-color, 3%);
       @include transition(all 0.2s ease);
 
-      [theme=dark] & {
+      [theme='dark'] & {
         color: $code-info-color-dark;
-        background: darken($code-background-color-dark, 6%);
+        background: darken($code-background-color-dark, 3%);
       }
 
       &:hover {
@@ -95,32 +97,32 @@ pre {
 
       .code-title {
         width: 100%;
-        padding: .4rem;
+        padding: 0.4rem;
 
         .arrow {
-          padding: 0 .2rem;
+          padding: 0 0.2rem;
           @include transition(transform 0.2s ease);
         }
       }
 
       .code-title::after {
-        padding-left: .2rem;
+        padding-left: 0.2rem;
         content: 'Code';
       }
 
       .ellipses {
-        padding: .4rem;
+        padding: 0.4rem;
       }
-  
+
       .copy {
         display: none;
-        padding: .4rem;
-  
+        padding: 0.4rem;
+
         &:hover {
           cursor: pointer;
           color: $global-link-hover-color;
-  
-          [theme=dark] & {
+
+          [theme='dark'] & {
             color: $global-link-hover-color-dark;
           }
         }
@@ -133,106 +135,66 @@ pre {
       }
     }
 
-    /* LineTable */
-    .lntable {
-      border-spacing: 0;
-      width: auto;
-      overflow: auto;
-      display: block;
-
-      background: $code-background-color;
-
-      [theme=dark] & {
-        background: $code-background-color-dark;
-      }
-
-      /* LineTableTD */
-      .lntd {
-        vertical-align: top;
-        padding: 0;
-
-        // line numbers
-        &:first-child {
-          min-width: 1.6rem;
-          text-align: right;
-
-          pre {
-            padding: .25rem;
-          }
-
-          /* LineNumbers */
-          .ln {
-            padding-right: .75rem;
-          }
-
-          /* LineNumbersTable */
-          .lnt, .ln {
-            color: $global-font-secondary-color;
-
-            [theme=dark] & {
-              color: $global-font-secondary-color-dark;
-            }
-          }
-        }
-
-        // code content
-        &:last-child {
-          width: 100%;
-
-          pre {
-            padding: .25rem .5rem .25rem .25rem;
-
-            code {
-              width: 100%;
-            }
-          }
-
-          /* LineHighlight */
-          .hl {
-            display: block;
-            background-color: #fff8c5;
-            box-shadow: -2px 0 0 #edd88b;
-
-            [theme=dark] & {
-              background-color: darken($code-background-color-dark, 5%);
-            }
-          }
-
-          /* GenericUnderline */
-          .gl {
-            text-decoration: underline;
-          }
-          /* GenericStrong */
-          .gs {
-            font-weight: bold;
-          }
-          /* GenericEmph */
-          .ge {
-            font-style: italic;
-          }
-        }
-      }
-
-      pre {
-        border-radius: 0;
-      }
-
-    }
-
     .table-wrapper {
       max-height: 0;
       overflow: hidden;
       border-radius: 0 0 $global-border-radius $global-border-radius;
       @include details-transition-open;
+
+      > table {
+        border-spacing: 0;
+        width: auto;
+        overflow: auto;
+        display: block;
+        background: $code-background-color;
+
+        [theme='dark'] & {
+          background: $code-background-color-dark;
+        }
+
+        td {
+          vertical-align: top;
+          padding: 0;
+        }
+
+        pre {
+          padding: 0.25rem 0.5rem 0.25rem 0;
+          border-radius: 0;
+        }
+      }
+
+      // ========== lineNumbersInTable ========== //
+      // line numbers
+      .lntd:first-child {
+        min-width: 1.6rem;
+        text-align: right;
+
+        pre {
+          padding-right: 0;
+        }
+      }
+      // code content
+      .lntd:last-child {
+        width: 100%;
+
+        pre {
+          padding-left: 0.5rem;
+          padding-right: 0.5rem;
+        }
+        code {
+          width: 100%;
+        }
+      }
+      // ========== lineNumbersInTable ========== //
     }
 
     &.open {
       .code-header {
-        background: darken($code-background-color, 3%);
+        background: darken($code-background-color, 6%);
         border-radius: $global-border-radius $global-border-radius 0 0;
 
-        [theme=dark] & {
-          background: darken($code-background-color-dark, 3%);
+        [theme='dark'] & {
+          background: darken($code-background-color-dark, 6%);
         }
       }
 
@@ -255,29 +217,82 @@ pre {
     }
   }
 
+  /* LineHighlight */
+  .hl {
+    display: block;
+    background-color: $code-hightlight-color;
+    box-shadow: -0.5rem 0 0 $code-hightlight-color, 0.5rem 0 0 $code-hightlight-color;
+
+    [theme='dark'] & {
+      background-color: $code-hightlight-color-dark;
+      box-shadow: -0.5rem 0 0 $code-hightlight-color-dark, 0.5rem 0 0 $code-hightlight-color-dark;
+    }
+  }
+  /* GenericUnderline */
+  .gl {
+    text-decoration: underline;
+  }
+  /* GenericStrong */
+  .gs {
+    font-weight: bold;
+  }
+  /* GenericEmph */
+  .ge {
+    font-style: italic;
+  }
+  /* lineNumbersInTable=false */
+  .ln {
+    padding-right: 0.5rem;
+    display: inline-block;
+    min-width: 1.6rem;
+    text-align: right;
+  }
+  /* LineNumbers */
+  .lnt,
+  .ln {
+    color: $global-font-secondary-color;
+
+    [theme='dark'] & {
+      color: $global-font-secondary-color-dark;
+    }
+  }
+
   // ========== Higtlight Color ========== //
 
   /* Error */
-  .err { 
+  .err {
     font-style: italic;
+    background-color: #efd2d2;
     border-bottom: 1px dotted $code-error-color;
   }
   /* GenericDeleted */
   .gd {
     background-color: #ffebe9;
+
+    [theme='dark'] & {
+      background-color: #78191b;
+    }
   }
   /* GenericInserted */
   .gi {
     background-color: #dafbe1;
+
+    [theme='dark'] & {
+      background-color: #1b4721;
+    }
   }
 
   @each $class, $color in $code-highlight-color-map {
-    .#{$class} { color: $color; }
+    .#{$class} {
+      color: $color;
+    }
   }
 
-  [theme=dark] & {
+  [theme='dark'] & {
     @each $class, $color in $code-highlight-color-map-dark {
-      .#{$class} { color: $color; }
+      .#{$class} {
+        color: $color;
+      }
     }
   }
   // ========== Higtlight Color ========== //
@@ -285,22 +300,24 @@ pre {
 
 // gist shortcode
 .gist {
-  .gist-file, .gist-data, .gist-meta {
+  .gist-file,
+  .gist-data,
+  .gist-meta {
     border: none;
   }
 
   .gist-meta {
-    padding: .4rem .8rem;
+    padding: 0.4rem 0.8rem;
     background-color: darken($code-background-color, 5%);
 
     @include link(false, false);
 
-    [theme=dark] & {
+    [theme='dark'] & {
       background-color: darken($code-background-color-dark, 5%);
     }
   }
 
-  [theme=dark] & {
+  [theme='dark'] & {
     // imported from https://github.com/lonekorean/gist-syntax-themes/blob/master/stylesheets/one-dark.css
     .highlight {
       background: #141414;
diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss
index 44cc8575..5fb8e5a3 100644
--- a/assets/css/_variables.scss
+++ b/assets/css/_variables.scss
@@ -13,7 +13,7 @@ $global-line-height: 1.5rem;
 $global-border-radius: 5px !default;
 
 // Color of the background
-$global-background-color: #fff !default;
+$global-background-color: #ffffff !default;
 $global-background-color-dark: #292a2d !default;
 
 // Color of the text
@@ -111,14 +111,18 @@ $pagination-link-hover-color-dark: #fff !default;
 // ========== Code ========== //
 // Color of the code
 $code-color: #24292f !default;
-$code-color-dark: #E5BF78 !default;
+$code-color-dark: #adbac7 !default;
 
 // Color of the code background
 $code-background-color: #f6f8fa !default;
-$code-background-color-dark: #272C34 !default;
+$code-background-color-dark: #2d333b !default;
 
 $code-error-color: #dc3545 !default;
 
+// Color of the hightlight code
+$code-hightlight-color: #fff8c5 !default;
+$code-hightlight-color-dark: rgba(174, 124, 20, 0.15) !default;
+
 $code-info-color: #9c9c9c !default;
 $code-info-color-dark: #b1b0b0 !default;
 
@@ -261,82 +265,82 @@ $code-highlight-color-map: (
   /* Other */ 'x': $code-color
 ) !default;
 $code-highlight-color-map-dark: (
-  /* Error */ 'err': $code-error-color, //
-  /* Keyword */ 'k': #66d9ef,
-  /* KeywordConstant */ 'kc': #66d9ef,
-  /* KeywordDeclaration */ 'kd': #66d9ef,
-  /* KeywordNamespace */ 'kn': #116329,
-  /* KeywordPseudo */ 'kp': #66d9ef,
-  /* KeywordReserved */ 'kr': #66d9ef,
-  /* KeywordType */ 'kt': #66d9ef,
+  /* Error */ 'err': $code-error-color,
+  /* Keyword */ 'k': #f47067,
+  /* KeywordConstant */ 'kc': #6cb6ff,
+  /* KeywordDeclaration */ 'kd': #f47067,
+  /* KeywordNamespace */ 'kn': #f47067,
+  /* KeywordPseudo */ 'kp': #f47067,
+  /* KeywordReserved */ 'kr': #f47067,
+  /* KeywordType */ 'kt': #dcbdfb,
   /* Name */ 'n': $code-color-dark,
-  /* NameAttribute */ 'na': #a6e22e,
-  /* NameBuiltin */ 'nb': $code-color-dark,
-  /* NameBuiltinPseudo */ 'bp': $code-color-dark,
-  /* NameClass */ 'nc': #a6e22e,
-  /* NameConstant */ 'no': #66d9ef,
-  /* NameDecorator */ 'nd': #a6e22e,
-  /* NameEntity */ 'ni': $code-color-dark,
-  /* NameException */ 'ne': #a6e22e,
-  /* NameFunction */ 'nf': #a6e22e,
+  /* NameAttribute */ 'na': #008080,
+  /* NameBuiltin */ 'nb': #0086b3,
+  /* NameBuiltinPseudo */ 'bp': #999999,
+  /* NameClass */ 'nc': #dcbdfb,
+  /* NameConstant */ 'no': #008080,
+  /* NameDecorator */ 'nd': #3c5d5d,
+  /* NameEntity */ 'ni': #800080,
+  /* NameException */ 'ne': #dcbdfb,
+  /* NameFunction */ 'nf': #dcbdfb,
   /* NameFunctionMagic */ 'fm': $code-color-dark,
-  /* NameLabel */ 'nl': $code-color-dark,
-  /* NameNamespace */ 'nn': $code-color-dark,
+  /* NameLabel */ 'nl': #dcbdfb,
+  /* NameNamespace */ 'nn': #dcbdfb,
   /* NameOther */ 'nx': $code-color-dark,
   /* NameProperty */ 'py': $code-color-dark,
-  /* NameTag */ 'nt': #116329,
-  /* NameVariable */ 'nv': $code-color-dark,
-  /* NameVariableClass */ 'vc': $code-color-dark,
-  /* NameVariableGlobal */ 'vg': $code-color-dark,
-  /* NameVariableInstance */ 'vi': $code-color-dark,
+  /* NameTag */ 'nt': #8ddb8c,
+  /* NameVariable */ 'nv': #008080,
+  /* NameVariableClass */ 'vc': #008080,
+  /* NameVariableGlobal */ 'vg': #008080,
+  /* NameVariableInstance */ 'vi': #008080,
   /* NameVariableMagic */ 'vm': $code-color-dark,
-  /* Literal */ 'l': #0550ae,
-  /* LiteralDate */ 'ld': #e6db74,
-  /* LiteralString */ 's': #e6db74,
-  /* LiteralStringAffix */ 'sa': #e6db74,
-  /* LiteralStringBacktick */ 'sb': #e6db74,
-  /* LiteralStringChar */ 'sc': #e6db74,
-  /* LiteralStringDelimiter */ 'dl': #e6db74,
-  /* LiteralStringDoc */ 'sd': #e6db74,
-  /* LiteralStringDouble */ 's2': #e6db74,
-  /* LiteralStringEscape */ 'se': #0550ae,
-  /* LiteralStringHeredoc */ 'sh': #e6db74,
-  /* LiteralStringInterpol */ 'si': #e6db74,
-  /* LiteralStringOther */ 'sx': #e6db74,
-  /* LiteralStringRegex */ 'sr': #e6db74,
-  /* LiteralStringSingle */ 's1': #e6db74,
-  /* LiteralStringSymbol */ 'ss': #e6db74,
-  /* LiteralNumber */ 'm': #0550ae,
-  /* LiteralNumberBin */ 'mb': #0550ae,
-  /* LiteralNumberFloat */ 'mf': #0550ae,
-  /* LiteralNumberHex */ 'mh': #0550ae,
-  /* LiteralNumberInteger */ 'mi': #0550ae,
-  /* LiteralNumberIntegerLong */ 'il': #0550ae,
-  /* LiteralNumberOct */ 'mo': #0550ae,
-  /* Operator */ 'o': #116329,
-  /* OperatorWord */ 'ow': #116329,
+  /* Literal */ 'l': $code-color-dark,
+  /* LiteralDate */ 'ld': $code-color-dark,
+  /* LiteralString */ 's': #96d0ff,
+  /* LiteralStringAffix */ 'sa': #96d0ff,
+  /* LiteralStringBacktick */ 'sb': #96d0ff,
+  /* LiteralStringChar */ 'sc': #96d0ff,
+  /* LiteralStringDelimiter */ 'dl': #96d0ff,
+  /* LiteralStringDoc */ 'sd': #96d0ff,
+  /* LiteralStringDouble */ 's2': #96d0ff,
+  /* LiteralStringEscape */ 'se': #96d0ff,
+  /* LiteralStringHeredoc */ 'sh': #96d0ff,
+  /* LiteralStringInterpol */ 'si': #96d0ff,
+  /* LiteralStringOther */ 'sx': #96d0ff,
+  /* LiteralStringRegex */ 'sr': #96d0ff,
+  /* LiteralStringSingle */ 's1': #96d0ff,
+  /* LiteralStringSymbol */ 'ss': #96d0ff,
+  /* LiteralNumber */ 'm': #009999,
+  /* LiteralNumberBin */ 'mb': #009999,
+  /* LiteralNumberFloat */ 'mf': #009999,
+  /* LiteralNumberHex */ 'mh': #009999,
+  /* LiteralNumberInteger */ 'mi': #009999,
+  /* LiteralNumberIntegerLong */ 'il': #009999,
+  /* LiteralNumberOct */ 'mo': #009999,
+  /* Operator */ 'o': #f47067,
+  /* OperatorWord */ 'ow': #f47067,
   /* Punctuation */ 'p': $code-color-dark,
-  /* Comment */ 'c': #75715e,
-  /* CommentHashbang */ 'ch': #75715e,
-  /* CommentMultiline */ 'cm': #75715e,
-  /* CommentSingle */ 'c1': #75715e,
-  /* CommentSpecial */ 'cs': #75715e,
-  /* CommentPreproc */ 'cp': #75715e,
-  /* CommentPreprocFile */ 'cpf': #75715e,
+  /* Comment */ 'c': #768390,
+  /* CommentHashbang */ 'ch': #768390,
+  /* CommentMultiline */ 'cm': #768390,
+  /* CommentSingle */ 'c1': #768390,
+  /* CommentSpecial */ 'cs': #999999,
+  /* CommentPreproc */ 'cp': #999999,
+  /* CommentPreprocFile */ 'cpf': #999999,
   /* Generic */ 'g': $code-color-dark,
-  /* GenericDeleted */ 'gd': #116329,
+  /* GenericDeleted */ 'gd': #ffd8d3,
   /* GenericEmph */ 'ge': $code-color-dark,
-  /* GenericError */ 'gr': $code-color-dark,
-  /* GenericHeading */ 'gh': $code-color-dark,
-  /* GenericInserted */ 'gi': #a6e22e,
-  /* GenericOutput */ 'go': $code-color-dark,
-  /* GenericPrompt */ 'gp': $code-color-dark,
+  /* GenericError */ 'gr': #aa0000,
+  /* GenericHeading */ 'gh': #999999,
+  /* GenericInserted */ 'gi': #b4f1b4,
+  /* GenericOutput */ 'go': #888888,
+  /* GenericPrompt */ 'gp': #adbac7,
   /* GenericStrong */ 'gs': $code-color-dark,
-  /* GenericSubheading */ 'gu': #75715e,
-  /* GenericTraceback */ 'gt': $code-color-dark,
+  /* GenericSubheading */ 'gu': #aaaaaa,
+  /* GenericTraceback */ 'gt': #aa0000,
   /* GenericUnderline */ 'gl': $code-color-dark,
-  /* TextWhitespace */ 'w': $code-color-dark,
-  /* Other */ 'x': $code-color-dark
+  /* TextWhitespace */ 'w': #bbbbbb,
+  /* Other */ 'x': $code-color-dark,
 ) !default;
 // ========== Code ========== //
 
diff --git a/exampleSite/content/tests/highlight.md b/exampleSite/content/tests/highlight.md
index 62a4ef62..8eb6cec6 100644
--- a/exampleSite/content/tests/highlight.md
+++ b/exampleSite/content/tests/highlight.md
@@ -22,7 +22,7 @@ draft: true
 ```java
 /**
  * @author John Smith <john.smith@example.com>
-*/
+ */
 package l2f.gameserver.model;
 
 public abstract strictfp class L2Char extends L2Object {