From 94c880169350bb000da2dfda8aa24859819a7477 Mon Sep 17 00:00:00 2001
From: Jimmy Cai <jimmehcai@gmail.com>
Date: Sat, 19 Dec 2020 11:49:42 +0100
Subject: [PATCH] Merge branch 'master' into toggle-dark-mode

---
 assets/scss/partials/highlight/dark.scss      | 385 +++++++++++++++++
 assets/scss/partials/highlight/light.scss     | 407 ++++++++++++++++++
 assets/scss/partials/menu.scss                |   2 +-
 assets/scss/variables.scss                    |  18 +-
 assets/ts/darkmode.ts                         |   4 +-
 layouts/_default/baseof.html                  |  16 +-
 .../partials/footer/components/highlight.html |   4 -
 layouts/partials/footer/include.html          |   1 -
 8 files changed, 821 insertions(+), 16 deletions(-)
 create mode 100644 assets/scss/partials/highlight/dark.scss
 create mode 100644 assets/scss/partials/highlight/light.scss
 delete mode 100644 layouts/partials/footer/components/highlight.html

diff --git a/assets/scss/partials/highlight/dark.scss b/assets/scss/partials/highlight/dark.scss
new file mode 100644
index 0000000..00e8942
--- /dev/null
+++ b/assets/scss/partials/highlight/dark.scss
@@ -0,0 +1,385 @@
+/*
+*   Style: monokai
+*   https://xyproto.github.io/splash/docs/monokai.html
+*/
+
+/* Background */
+.chroma {
+    color: #f8f8f2;
+    background-color: #272822
+}
+
+/* Other */
+.chroma .x {}
+
+/* Error */
+.chroma .err {
+    color: #960050;
+    background-color: #1e0010
+}
+
+/* LineTableTD */
+.chroma .lntd {
+    vertical-align: top;
+    padding: 0;
+    margin: 0;
+    border: 0;
+}
+
+/* LineTable */
+.chroma .lntable {
+    border-spacing: 0;
+    padding: 0;
+    margin: 0;
+    border: 0;
+    width: auto;
+    overflow: auto;
+    display: block;
+}
+
+/* LineHighlight */
+.chroma .hl {
+    display: block;
+    width: 100%;
+    background-color: #ffffcc
+}
+
+/* LineNumbersTable */
+.chroma .lnt {
+    margin-right: 0.4em;
+    padding: 0 0.4em 0 0.4em;
+    color: #7f7f7f
+}
+
+/* LineNumbers */
+.chroma .ln {
+    margin-right: 0.4em;
+    padding: 0 0.4em 0 0.4em;
+    color: #7f7f7f
+}
+
+/* Keyword */
+.chroma .k {
+    color: #66d9ef
+}
+
+/* KeywordConstant */
+.chroma .kc {
+    color: #66d9ef
+}
+
+/* KeywordDeclaration */
+.chroma .kd {
+    color: #66d9ef
+}
+
+/* KeywordNamespace */
+.chroma .kn {
+    color: #f92672
+}
+
+/* KeywordPseudo */
+.chroma .kp {
+    color: #66d9ef
+}
+
+/* KeywordReserved */
+.chroma .kr {
+    color: #66d9ef
+}
+
+/* KeywordType */
+.chroma .kt {
+    color: #66d9ef
+}
+
+/* Name */
+.chroma .n {}
+
+/* NameAttribute */
+.chroma .na {
+    color: #a6e22e
+}
+
+/* NameBuiltin */
+.chroma .nb {}
+
+/* NameBuiltinPseudo */
+.chroma .bp {}
+
+/* NameClass */
+.chroma .nc {
+    color: #a6e22e
+}
+
+/* NameConstant */
+.chroma .no {
+    color: #66d9ef
+}
+
+/* NameDecorator */
+.chroma .nd {
+    color: #a6e22e
+}
+
+/* NameEntity */
+.chroma .ni {}
+
+/* NameException */
+.chroma .ne {
+    color: #a6e22e
+}
+
+/* NameFunction */
+.chroma .nf {
+    color: #a6e22e
+}
+
+/* NameFunctionMagic */
+.chroma .fm {}
+
+/* NameLabel */
+.chroma .nl {}
+
+/* NameNamespace */
+.chroma .nn {}
+
+/* NameOther */
+.chroma .nx {
+    color: #a6e22e
+}
+
+/* NameProperty */
+.chroma .py {}
+
+/* NameTag */
+.chroma .nt {
+    color: #f92672
+}
+
+/* NameVariable */
+.chroma .nv {}
+
+/* NameVariableClass */
+.chroma .vc {}
+
+/* NameVariableGlobal */
+.chroma .vg {}
+
+/* NameVariableInstance */
+.chroma .vi {}
+
+/* NameVariableMagic */
+.chroma .vm {}
+
+/* Literal */
+.chroma .l {
+    color: #ae81ff
+}
+
+/* LiteralDate */
+.chroma .ld {
+    color: #e6db74
+}
+
+/* LiteralString */
+.chroma .s {
+    color: #e6db74
+}
+
+/* LiteralStringAffix */
+.chroma .sa {
+    color: #e6db74
+}
+
+/* LiteralStringBacktick */
+.chroma .sb {
+    color: #e6db74
+}
+
+/* LiteralStringChar */
+.chroma .sc {
+    color: #e6db74
+}
+
+/* LiteralStringDelimiter */
+.chroma .dl {
+    color: #e6db74
+}
+
+/* LiteralStringDoc */
+.chroma .sd {
+    color: #e6db74
+}
+
+/* LiteralStringDouble */
+.chroma .s2 {
+    color: #e6db74
+}
+
+/* LiteralStringEscape */
+.chroma .se {
+    color: #ae81ff
+}
+
+/* LiteralStringHeredoc */
+.chroma .sh {
+    color: #e6db74
+}
+
+/* LiteralStringInterpol */
+.chroma .si {
+    color: #e6db74
+}
+
+/* LiteralStringOther */
+.chroma .sx {
+    color: #e6db74
+}
+
+/* LiteralStringRegex */
+.chroma .sr {
+    color: #e6db74
+}
+
+/* LiteralStringSingle */
+.chroma .s1 {
+    color: #e6db74
+}
+
+/* LiteralStringSymbol */
+.chroma .ss {
+    color: #e6db74
+}
+
+/* LiteralNumber */
+.chroma .m {
+    color: #ae81ff
+}
+
+/* LiteralNumberBin */
+.chroma .mb {
+    color: #ae81ff
+}
+
+/* LiteralNumberFloat */
+.chroma .mf {
+    color: #ae81ff
+}
+
+/* LiteralNumberHex */
+.chroma .mh {
+    color: #ae81ff
+}
+
+/* LiteralNumberInteger */
+.chroma .mi {
+    color: #ae81ff
+}
+
+/* LiteralNumberIntegerLong */
+.chroma .il {
+    color: #ae81ff
+}
+
+/* LiteralNumberOct */
+.chroma .mo {
+    color: #ae81ff
+}
+
+/* Operator */
+.chroma .o {
+    color: #f92672
+}
+
+/* OperatorWord */
+.chroma .ow {
+    color: #f92672
+}
+
+/* Punctuation */
+.chroma .p {}
+
+/* Comment */
+.chroma .c {
+    color: #75715e
+}
+
+/* CommentHashbang */
+.chroma .ch {
+    color: #75715e
+}
+
+/* CommentMultiline */
+.chroma .cm {
+    color: #75715e
+}
+
+/* CommentSingle */
+.chroma .c1 {
+    color: #75715e
+}
+
+/* CommentSpecial */
+.chroma .cs {
+    color: #75715e
+}
+
+/* CommentPreproc */
+.chroma .cp {
+    color: #75715e
+}
+
+/* CommentPreprocFile */
+.chroma .cpf {
+    color: #75715e
+}
+
+/* Generic */
+.chroma .g {}
+
+/* GenericDeleted */
+.chroma .gd {
+    color: #f92672
+}
+
+/* GenericEmph */
+.chroma .ge {
+    font-style: italic
+}
+
+/* GenericError */
+.chroma .gr {}
+
+/* GenericHeading */
+.chroma .gh {}
+
+/* GenericInserted */
+.chroma .gi {
+    color: #a6e22e
+}
+
+/* GenericOutput */
+.chroma .go {}
+
+/* GenericPrompt */
+.chroma .gp {}
+
+/* GenericStrong */
+.chroma .gs {
+    font-weight: bold
+}
+
+/* GenericSubheading */
+.chroma .gu {
+    color: #75715e
+}
+
+/* GenericTraceback */
+.chroma .gt {}
+
+/* GenericUnderline */
+.chroma .gl {}
+
+/* TextWhitespace */
+.chroma .w {}
\ No newline at end of file
diff --git a/assets/scss/partials/highlight/light.scss b/assets/scss/partials/highlight/light.scss
new file mode 100644
index 0000000..7ac7d71
--- /dev/null
+++ b/assets/scss/partials/highlight/light.scss
@@ -0,0 +1,407 @@
+/*
+*   Style: monokailight
+*   https://xyproto.github.io/splash/docs/monokailight.html
+*/
+
+/* Background */
+.chroma {
+    color: #272822;
+    background-color: #fafafa;
+}
+
+/* Other */
+.chroma .x {}
+
+/* Error */
+.chroma .err {
+    color: #960050;
+    background-color: #1e0010
+}
+
+/* LineTableTD */
+.chroma .lntd {
+    vertical-align: top;
+    padding: 0;
+    margin: 0;
+    border: 0;
+}
+
+/* LineTable */
+.chroma .lntable {
+    border-spacing: 0;
+    padding: 0;
+    margin: 0;
+    border: 0;
+    width: auto;
+    overflow: auto;
+    display: block;
+}
+
+/* LineHighlight */
+.chroma .hl {
+    display: block;
+    width: 100%;
+    background-color: #ffffcc
+}
+
+/* LineNumbersTable */
+.chroma .lnt {
+    margin-right: 0.4em;
+    padding: 0 0.4em 0 0.4em;
+    color: #7f7f7f
+}
+
+/* LineNumbers */
+.chroma .ln {
+    margin-right: 0.4em;
+    padding: 0 0.4em 0 0.4em;
+    color: #7f7f7f
+}
+
+/* Keyword */
+.chroma .k {
+    color: #00a8c8
+}
+
+/* KeywordConstant */
+.chroma .kc {
+    color: #00a8c8
+}
+
+/* KeywordDeclaration */
+.chroma .kd {
+    color: #00a8c8
+}
+
+/* KeywordNamespace */
+.chroma .kn {
+    color: #f92672
+}
+
+/* KeywordPseudo */
+.chroma .kp {
+    color: #00a8c8
+}
+
+/* KeywordReserved */
+.chroma .kr {
+    color: #00a8c8
+}
+
+/* KeywordType */
+.chroma .kt {
+    color: #00a8c8
+}
+
+/* Name */
+.chroma .n {
+    color: #111111
+}
+
+/* NameAttribute */
+.chroma .na {
+    color: #75af00
+}
+
+/* NameBuiltin */
+.chroma .nb {
+    color: #111111
+}
+
+/* NameBuiltinPseudo */
+.chroma .bp {
+    color: #111111
+}
+
+/* NameClass */
+.chroma .nc {
+    color: #75af00
+}
+
+/* NameConstant */
+.chroma .no {
+    color: #00a8c8
+}
+
+/* NameDecorator */
+.chroma .nd {
+    color: #75af00
+}
+
+/* NameEntity */
+.chroma .ni {
+    color: #111111
+}
+
+/* NameException */
+.chroma .ne {
+    color: #75af00
+}
+
+/* NameFunction */
+.chroma .nf {
+    color: #75af00
+}
+
+/* NameFunctionMagic */
+.chroma .fm {
+    color: #111111
+}
+
+/* NameLabel */
+.chroma .nl {
+    color: #111111
+}
+
+/* NameNamespace */
+.chroma .nn {
+    color: #111111
+}
+
+/* NameOther */
+.chroma .nx {
+    color: #75af00
+}
+
+/* NameProperty */
+.chroma .py {
+    color: #111111
+}
+
+/* NameTag */
+.chroma .nt {
+    color: #f92672
+}
+
+/* NameVariable */
+.chroma .nv {
+    color: #111111
+}
+
+/* NameVariableClass */
+.chroma .vc {
+    color: #111111
+}
+
+/* NameVariableGlobal */
+.chroma .vg {
+    color: #111111
+}
+
+/* NameVariableInstance */
+.chroma .vi {
+    color: #111111
+}
+
+/* NameVariableMagic */
+.chroma .vm {
+    color: #111111
+}
+
+/* Literal */
+.chroma .l {
+    color: #ae81ff
+}
+
+/* LiteralDate */
+.chroma .ld {
+    color: #d88200
+}
+
+/* LiteralString */
+.chroma .s {
+    color: #d88200
+}
+
+/* LiteralStringAffix */
+.chroma .sa {
+    color: #d88200
+}
+
+/* LiteralStringBacktick */
+.chroma .sb {
+    color: #d88200
+}
+
+/* LiteralStringChar */
+.chroma .sc {
+    color: #d88200
+}
+
+/* LiteralStringDelimiter */
+.chroma .dl {
+    color: #d88200
+}
+
+/* LiteralStringDoc */
+.chroma .sd {
+    color: #d88200
+}
+
+/* LiteralStringDouble */
+.chroma .s2 {
+    color: #d88200
+}
+
+/* LiteralStringEscape */
+.chroma .se {
+    color: #8045ff
+}
+
+/* LiteralStringHeredoc */
+.chroma .sh {
+    color: #d88200
+}
+
+/* LiteralStringInterpol */
+.chroma .si {
+    color: #d88200
+}
+
+/* LiteralStringOther */
+.chroma .sx {
+    color: #d88200
+}
+
+/* LiteralStringRegex */
+.chroma .sr {
+    color: #d88200
+}
+
+/* LiteralStringSingle */
+.chroma .s1 {
+    color: #d88200
+}
+
+/* LiteralStringSymbol */
+.chroma .ss {
+    color: #d88200
+}
+
+/* LiteralNumber */
+.chroma .m {
+    color: #ae81ff
+}
+
+/* LiteralNumberBin */
+.chroma .mb {
+    color: #ae81ff
+}
+
+/* LiteralNumberFloat */
+.chroma .mf {
+    color: #ae81ff
+}
+
+/* LiteralNumberHex */
+.chroma .mh {
+    color: #ae81ff
+}
+
+/* LiteralNumberInteger */
+.chroma .mi {
+    color: #ae81ff
+}
+
+/* LiteralNumberIntegerLong */
+.chroma .il {
+    color: #ae81ff
+}
+
+/* LiteralNumberOct */
+.chroma .mo {
+    color: #ae81ff
+}
+
+/* Operator */
+.chroma .o {
+    color: #f92672
+}
+
+/* OperatorWord */
+.chroma .ow {
+    color: #f92672
+}
+
+/* Punctuation */
+.chroma .p {
+    color: #111111
+}
+
+/* Comment */
+.chroma .c {
+    color: #75715e
+}
+
+/* CommentHashbang */
+.chroma .ch {
+    color: #75715e
+}
+
+/* CommentMultiline */
+.chroma .cm {
+    color: #75715e
+}
+
+/* CommentSingle */
+.chroma .c1 {
+    color: #75715e
+}
+
+/* CommentSpecial */
+.chroma .cs {
+    color: #75715e
+}
+
+/* CommentPreproc */
+.chroma .cp {
+    color: #75715e
+}
+
+/* CommentPreprocFile */
+.chroma .cpf {
+    color: #75715e
+}
+
+/* Generic */
+.chroma .g {}
+
+/* GenericDeleted */
+.chroma .gd {}
+
+/* GenericEmph */
+.chroma .ge {
+    font-style: italic
+}
+
+/* GenericError */
+.chroma .gr {}
+
+/* GenericHeading */
+.chroma .gh {}
+
+/* GenericInserted */
+.chroma .gi {}
+
+/* GenericOutput */
+.chroma .go {}
+
+/* GenericPrompt */
+.chroma .gp {}
+
+/* GenericStrong */
+.chroma .gs {
+    font-weight: bold
+}
+
+/* GenericSubheading */
+.chroma .gu {}
+
+/* GenericTraceback */
+.chroma .gt {}
+
+/* GenericUnderline */
+.chroma .gl {}
+
+/* TextWhitespace */
+.chroma .w {}
\ No newline at end of file
diff --git a/assets/scss/partials/menu.scss b/assets/scss/partials/menu.scss
index 7aa5acd..9c49b2e 100644
--- a/assets/scss/partials/menu.scss
+++ b/assets/scss/partials/menu.scss
@@ -213,7 +213,7 @@
     }
 }
 
-.theme-dark {
+[data-scheme="dark"] {
     #dark-mode-toggle {
         color: var(--accent-color);
         font-weight: 700;
diff --git a/assets/scss/variables.scss b/assets/scss/variables.scss
index 495ef1a..f949ff3 100644
--- a/assets/scss/variables.scss
+++ b/assets/scss/variables.scss
@@ -1,6 +1,18 @@
 $defaultTagBackgrounds: #8ea885, #df7988, #0177b8, #ffb900, #6b69d6;
 $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
 
+[data-scheme="light"]{
+    --pre-text-color: #272822;
+    --pre-background-color: #fafafa;
+    @import "partials/highlight/light.scss";
+}
+
+[data-scheme="dark"]{
+    --pre-text-color: #f8f8f2;
+    --pre-background-color: #272822;
+    @import "partials/highlight/dark.scss";
+}
+
 /*
 *   Global style
 */
@@ -25,7 +37,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
 
     --section-separation: 40px;
 
-    .theme-dark {
+    [data-scheme="dark"] {
         --body-background: #303030;
         --accent-color: #ecf0f1;
         --accent-color-darker: #bdc3c7;
@@ -72,7 +84,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
         --small-card-padding: 25px 20px;
     }
 
-    .theme-dark {
+    [data-scheme="dark"] {
         --card-background: #424242;
         --card-background-selected: rgba(255, 255, 255, 0.16);
         --card-text-color-main: rgba(255, 255, 255, 0.9);
@@ -116,7 +128,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
     --table-border-color: #dadada;
     --tr-even-background-color: #efefee;
 
-    .theme-dark {
+    [data-scheme="dark"] {
         --code-background-color: #272822;
         --code-text-color: rgba(255, 255, 255, 0.9);
 
diff --git a/assets/ts/darkmode.ts b/assets/ts/darkmode.ts
index e1bce49..1f2ce53 100644
--- a/assets/ts/darkmode.ts
+++ b/assets/ts/darkmode.ts
@@ -19,10 +19,10 @@ export default () => {
 
     const setBodyClass = () => {
         if (darkMode) {
-            document.body.classList.add('theme-dark');
+            document.body.dataset.scheme = 'dark';
         }
         else {
-            document.body.classList.remove('theme-dark');
+            document.body.dataset.scheme = 'light';
         }
     }
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index f4ad263..4c1c584 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,13 +7,19 @@
     <body class="{{ block `body-class` . }}{{ end }}">
         <script>
             (function() {
-                const darkModeKey = 'StackDarkMode';
-                const darkModeItem = localStorage.getItem(darkModeKey);
-                const darkModeEnabled = localStorage.getItem(darkModeKey) === 'true';
+                const colorSchemeKey = 'StackColorScheme';
+                const colorSchemeItem = localStorage.getItem(colorSchemeKey);
                 const supportDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches === true;
 
-                if(darkModeItem && darkModeEnabled || !darkModeItem && supportDarkMode){
-                    document.body.classList.add('theme-dark');
+                if (colorSchemeItem && colorSchemeItem == 'dark' || !colorSchemeItem && supportDarkMode || colorSchemeItem === 'auto' && supportDarkMode) {
+                    /**
+                     * Enable dark mode if:
+                     * 1. If dark mode is set already (in local storage)
+                     * 2. No color scheme preference is set in localstorage, and user's browser indicates preference for dark mode
+                     */
+                    document.body.dataset.scheme = 'dark';
+                } else {
+                    document.body.dataset.scheme = 'light';
                 }
             })();
         </script>
diff --git a/layouts/partials/footer/components/highlight.html b/layouts/partials/footer/components/highlight.html
deleted file mode 100644
index 80ec266..0000000
--- a/layouts/partials/footer/components/highlight.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{{- $light := resources.Get "css/highlight/light.css" | minify -}}
-{{- $dark := resources.Get "css/highlight/dark.css" | minify -}}
-<link rel="stylesheet" href="{{ $light.RelPermalink }}" media="(prefers-color-scheme: light)">
-<link rel="stylesheet" href="{{ $dark.RelPermalink }}" media="(prefers-color-scheme: dark)">
\ No newline at end of file
diff --git a/layouts/partials/footer/include.html b/layouts/partials/footer/include.html
index ffa7573..4b50a88 100644
--- a/layouts/partials/footer/include.html
+++ b/layouts/partials/footer/include.html
@@ -1,4 +1,3 @@
 {{ partialCached "footer/components/script.html" . }}
 {{ partialCached "footer/components/custom-font.html" . }}
-{{ partialCached "footer/components/highlight.html" . }}
 {{ partial "footer/custom.html" . }}
\ No newline at end of file