42 files changed, 262 insertions, 144 deletions
diff --git a/assets/css/prism-solarizeddark.css b/assets/css/prism-solarizeddark.css
new file mode 100644
index 0000000..9186fed
--- /dev/null
+++ b/assets/css/prism-solarizeddark.css
@@ -0,0 +1,127 @@
+/*
+ Solarized Color Schemes originally by Ethan Schoonover
+ http://ethanschoonover.com/solarized
+
+ Ported for PrismJS by Hector Matos
+ Website: https://krakendev.io
+ Twitter Handle: https://twitter.com/allonsykraken)
+*/
+
+/*
+SOLARIZED HEX
+--------- -------
+base03    #002b36
+base02    #8aa2d3
+base01    #586e75
+base00    #657b83
+base0     #839496
+base1     #93a1a1
+base2     #eee8d5
+base3     #fdf6e3
+yellow    #b58900
+orange    #cb4b16
+red       #dc322f
+magenta   #d33682
+violet    #6c71c4
+blue      #268bd2
+cyan      #2aa198
+green     #859900
+*/
+
+pre,
+code {
+    background-color: #4d5158;
+}
+
+code[class*='language-'],
+pre[class*='language-'] {
+    -moz-tab-size: 4;
+    -o-tab-size: 4;
+    tab-size: 4;
+
+    -webkit-hyphens: none;
+    -moz-hyphens: none;
+    -ms-hyphens: none;
+    hyphens: none;
+}
+
+pre[class*='language-']::-moz-selection,
+pre[class*='language-'] ::-moz-selection,
+code[class*='language-']::-moz-selection,
+code[class*='language-'] ::-moz-selection {
+    color: #fffffd;
+    background-color: #8aa2d3; /* base02 */
+}
+
+pre[class*='language-']::selection,
+pre[class*='language-'] ::selection,
+code[class*='language-']::selection,
+code[class*='language-'] ::selection {
+    color: #fffffd;
+    background-color: #8aa2d3; /* base02 */
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+    color: #93a1a1; /* base1 */
+}
+
+.token.punctuation {
+    color: #586e75; /* base01 */
+}
+
+.token.namespace {
+    opacity: 0.7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+    color: #268bd2; /* blue */
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.url,
+.token.inserted {
+    color: #2aa198; /* cyan */
+}
+
+.token.entity {
+    color: #657b83; /* base00 */
+    background: #eee8d5; /* base2 */
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+    color: #859900; /* green */
+}
+
+.token.function,
+.token.class-name {
+    color: #b58900; /* yellow */
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+    color: #cb4b16; /* orange */
+}
+
+.token.important,
+.token.bold {
+    font-weight: 600;
+}
+.token.italic {
+    font-style: italic;
+}
diff --git a/assets/css/prism-solarizedlight.css b/assets/css/prism-solarizedlight.css
new file mode 100644
index 0000000..51026ae
--- /dev/null
+++ b/assets/css/prism-solarizedlight.css
@@ -0,0 +1,127 @@
+/*
+ Solarized Color Schemes originally by Ethan Schoonover
+ http://ethanschoonover.com/solarized
+
+ Ported for PrismJS by Hector Matos
+ Website: https://krakendev.io
+ Twitter Handle: https://twitter.com/allonsykraken)
+*/
+
+/*
+SOLARIZED HEX
+--------- -------
+base03    #002b36
+base02    #8aa2d3
+base01    #586e75
+base00    #657b83
+base0     #839496
+base1     #93a1a1
+base2     #eee8d5
+base3     #fdf6e3
+yellow    #b58900
+orange    #cb4b16
+red       #dc322f
+magenta   #d33682
+violet    #6c71c4
+blue      #268bd2
+cyan      #2aa198
+green     #859900
+*/
+
+pre,
+code {
+    background-color: #f6f8fa;
+}
+
+code[class*='language-'],
+pre[class*='language-'] {
+    -moz-tab-size: 4;
+    -o-tab-size: 4;
+    tab-size: 4;
+
+    -webkit-hyphens: none;
+    -moz-hyphens: none;
+    -ms-hyphens: none;
+    hyphens: none;
+}
+
+pre[class*='language-']::-moz-selection,
+pre[class*='language-'] ::-moz-selection,
+code[class*='language-']::-moz-selection,
+code[class*='language-'] ::-moz-selection {
+    color: #fffffd;
+    background-color: #8aa2d3; /* base02 */
+}
+
+pre[class*='language-']::selection,
+pre[class*='language-'] ::selection,
+code[class*='language-']::selection,
+code[class*='language-'] ::selection {
+    color: #fffffd;
+    background-color: #8aa2d3; /* base02 */
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+    color: #93a1a1; /* base1 */
+}
+
+.token.punctuation {
+    color: #586e75; /* base01 */
+}
+
+.token.namespace {
+    opacity: 0.7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+    color: #268bd2; /* blue */
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.url,
+.token.inserted {
+    color: #2aa198; /* cyan */
+}
+
+.token.entity {
+    color: #657b83; /* base00 */
+    background: #eee8d5; /* base2 */
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+    color: #859900; /* green */
+}
+
+.token.function,
+.token.class-name {
+    color: #b58900; /* yellow */
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+    color: #cb4b16; /* orange */
+}
+
+.token.important,
+.token.bold {
+    font-weight: 600;
+}
+.token.italic {
+    font-style: italic;
+}
diff --git a/assets/_custom.scss b/assets/scss/_custom.scss
index ca09079..ca09079 100644
--- a/assets/_custom.scss
+++ b/assets/scss/_custom.scss
diff --git a/assets/_fuji-style/_components.scss b/assets/scss/_fuji-style/_components.scss
index 429d869..429d869 100644
--- a/assets/_fuji-style/_components.scss
+++ b/assets/scss/_fuji-style/_components.scss
diff --git a/assets/_fuji-style/_content.scss b/assets/scss/_fuji-style/_content.scss
index 201c2cb..fcb4f3b 100644
--- a/assets/_fuji-style/_content.scss
+++ b/assets/scss/_fuji-style/_content.scss
@@ -158,8 +158,4 @@ article {
         max-width: 98%;
         margin: 0 0.25rem 0.5rem 0.25rem;
     }
-
-    code {
-        scrollbar-width: thin; // Firefox
-    }
 }
diff --git a/assets/_fuji-style/_footer.scss b/assets/scss/_fuji-style/_footer.scss
index ab1bde1..ab1bde1 100644
--- a/assets/_fuji-style/_footer.scss
+++ b/assets/scss/_fuji-style/_footer.scss
diff --git a/assets/_fuji-style/_header.scss b/assets/scss/_fuji-style/_header.scss
index 29afe07..29afe07 100644
--- a/assets/_fuji-style/_header.scss
+++ b/assets/scss/_fuji-style/_header.scss
diff --git a/assets/_fuji-style/_sidebar.scss b/assets/scss/_fuji-style/_sidebar.scss
index 132a22f..132a22f 100644
--- a/assets/_fuji-style/_sidebar.scss
+++ b/assets/scss/_fuji-style/_sidebar.scss
diff --git a/assets/_fuji-theme/_dark.scss b/assets/scss/_fuji-theme/_dark.scss
index 122f3f1..9be3b61 100644
--- a/assets/_fuji-theme/_dark.scss
+++ b/assets/scss/_fuji-theme/_dark.scss
@@ -104,11 +104,6 @@ body[data-theme='dark'] {
         hr {
             height: 2px;
         }
-
-        pre,
-        code {
-            background-color: $color-divider-dark;
-        }
     }
 
     .post-loading,
@@ -134,66 +129,8 @@ body[data-theme='dark'] {
         }
     }
 
-    // highlight.js theme [solarized-dark]
-    .hljs {
-        display: block;
-        overflow-x: auto;
-    }
-    .hljs-comment,
-    .hljs-quote {
-        color: #85aab6;
-    }
-    .hljs-addition,
-    .hljs-keyword,
-    .hljs-selector-tag {
-        color: #bad601;
-    }
-    .hljs-doctag,
-    .hljs-literal,
-    .hljs-meta .hljs-meta-string,
-    .hljs-number,
-    .hljs-regexp,
-    .hljs-string {
-        color: #38cfc3;
-    }
-    .hljs-name,
-    .hljs-section,
-    .hljs-selector-class,
-    .hljs-selector-id,
-    .hljs-title {
-        color: #479fdf;
-    }
-    .hljs-attr,
-    .hljs-attribute,
-    .hljs-class .hljs-title,
-    .hljs-template-variable,
-    .hljs-type,
-    .hljs-variable {
-        color: #c9ac56;
-    }
-    .hljs-bullet,
-    .hljs-link,
-    .hljs-meta,
-    .hljs-meta .hljs-keyword,
-    .hljs-selector-attr,
-    .hljs-selector-pseudo,
-    .hljs-subst,
-    .hljs-symbol {
-        color: #db835d;
-    }
-    .hljs-built_in,
-    .hljs-deletion {
-        color: #e27876;
-    }
-    .hljs-formula {
-        background: #24849c;
-    }
-    .hljs-emphasis {
-        font-style: italic;
-    }
-    .hljs-strong {
-        font-weight: 600;
-    }
+    // prism.js theme [tomorrow-dark]
+    @import '../../css/prism-solarizeddark';
 
     // diff from light
     img {
diff --git a/assets/_fuji-theme/_light.scss b/assets/scss/_fuji-theme/_light.scss
index 58687ac..02749ed 100644
--- a/assets/_fuji-theme/_light.scss
+++ b/assets/scss/_fuji-theme/_light.scss
@@ -104,11 +104,6 @@ body[data-theme='light'] {
         hr {
             height: 2px;
         }
-
-        pre,
-        code {
-            background-color: #f2f2f2;
-        }
     }
 
     .post-loading,
@@ -135,64 +130,6 @@ body[data-theme='light'] {
         }
     }
 
-    // highlight.js theme [solarized-light]
-    .hljs {
-        display: block;
-        overflow-x: auto;
-    }
-    .hljs-comment,
-    .hljs-quote {
-        color: #93a1a1;
-    }
-    .hljs-addition,
-    .hljs-keyword,
-    .hljs-selector-tag {
-        color: #859900;
-    }
-    .hljs-doctag,
-    .hljs-literal,
-    .hljs-meta .hljs-meta-string,
-    .hljs-number,
-    .hljs-regexp,
-    .hljs-string {
-        color: #2aa198;
-    }
-    .hljs-name,
-    .hljs-section,
-    .hljs-selector-class,
-    .hljs-selector-id,
-    .hljs-title {
-        color: #268bd2;
-    }
-    .hljs-attr,
-    .hljs-attribute,
-    .hljs-class .hljs-title,
-    .hljs-template-variable,
-    .hljs-type,
-    .hljs-variable {
-        color: #b58900;
-    }
-    .hljs-bullet,
-    .hljs-link,
-    .hljs-meta,
-    .hljs-meta .hljs-keyword,
-    .hljs-selector-attr,
-    .hljs-selector-pseudo,
-    .hljs-subst,
-    .hljs-symbol {
-        color: #ca5624;
-    }
-    .hljs-built_in,
-    .hljs-deletion {
-        color: #da4a47;
-    }
-    .hljs-formula {
-        background: #eee8d5;
-    }
-    .hljs-emphasis {
-        font-style: italic;
-    }
-    .hljs-strong {
-        font-weight: 600;
-    }
+    // prism.js theme [olarized-light]
+    @import '../../css/prism-solarizedlight';
 }
diff --git a/assets/_global.scss b/assets/scss/_global.scss
index fb2c3f9..fb2c3f9 100644
--- a/assets/_global.scss
+++ b/assets/scss/_global.scss
diff --git a/assets/_primer/base/base.scss b/assets/scss/_primer/base/base.scss
index 381fa89..381fa89 100644
--- a/assets/_primer/base/base.scss
+++ b/assets/scss/_primer/base/base.scss
diff --git a/assets/_primer/base/index.scss b/assets/scss/_primer/base/index.scss
index 2c7f8b9..2c7f8b9 100644
--- a/assets/_primer/base/index.scss
+++ b/assets/scss/_primer/base/index.scss
diff --git a/assets/_primer/base/kbd.scss b/assets/scss/_primer/base/kbd.scss
index 7ee4503..7ee4503 100644
--- a/assets/_primer/base/kbd.scss
+++ b/assets/scss/_primer/base/kbd.scss
diff --git a/assets/_primer/base/normalize.scss b/assets/scss/_primer/base/normalize.scss
index 95931e7..95931e7 100644
--- a/assets/_primer/base/normalize.scss
+++ b/assets/scss/_primer/base/normalize.scss
diff --git a/assets/_primer/base/typography-base.scss b/assets/scss/_primer/base/typography-base.scss
index 83eb995..83eb995 100644
--- a/assets/_primer/base/typography-base.scss
+++ b/assets/scss/_primer/base/typography-base.scss
diff --git a/assets/_primer/layout/container.scss b/assets/scss/_primer/layout/container.scss
index 7e70a6b..7e70a6b 100644
--- a/assets/_primer/layout/container.scss
+++ b/assets/scss/_primer/layout/container.scss
diff --git a/assets/_primer/layout/grid.scss b/assets/scss/_primer/layout/grid.scss
index 5126c6b..5126c6b 100644
--- a/assets/_primer/layout/grid.scss
+++ b/assets/scss/_primer/layout/grid.scss
diff --git a/assets/_primer/markdown/blob-csv.scss b/assets/scss/_primer/markdown/blob-csv.scss
index e97e447..e97e447 100644
--- a/assets/_primer/markdown/blob-csv.scss
+++ b/assets/scss/_primer/markdown/blob-csv.scss
diff --git a/assets/_primer/markdown/code.scss b/assets/scss/_primer/markdown/code.scss
index fbd2d16..fbd2d16 100644
--- a/assets/_primer/markdown/code.scss
+++ b/assets/scss/_primer/markdown/code.scss
diff --git a/assets/_primer/markdown/headings.scss b/assets/scss/_primer/markdown/headings.scss
index 26347bb..26347bb 100644
--- a/assets/_primer/markdown/headings.scss
+++ b/assets/scss/_primer/markdown/headings.scss
diff --git a/assets/_primer/markdown/images.scss b/assets/scss/_primer/markdown/images.scss
index caea502..caea502 100644
--- a/assets/_primer/markdown/images.scss
+++ b/assets/scss/_primer/markdown/images.scss
diff --git a/assets/_primer/markdown/index.scss b/assets/scss/_primer/markdown/index.scss
index b2e8d3d..b2e8d3d 100644
--- a/assets/_primer/markdown/index.scss
+++ b/assets/scss/_primer/markdown/index.scss
diff --git a/assets/_primer/markdown/lists.scss b/assets/scss/_primer/markdown/lists.scss
index b680faf..b680faf 100644
--- a/assets/_primer/markdown/lists.scss
+++ b/assets/scss/_primer/markdown/lists.scss
diff --git a/assets/_primer/markdown/markdown-body.scss b/assets/scss/_primer/markdown/markdown-body.scss
index 6581f19..6581f19 100644
--- a/assets/_primer/markdown/markdown-body.scss
+++ b/assets/scss/_primer/markdown/markdown-body.scss
diff --git a/assets/_primer/markdown/tables.scss b/assets/scss/_primer/markdown/tables.scss
index 9d73d17..9d73d17 100644
--- a/assets/_primer/markdown/tables.scss
+++ b/assets/scss/_primer/markdown/tables.scss
diff --git a/assets/_primer/support/index.scss b/assets/scss/_primer/support/index.scss
index 93f9449..93f9449 100644
--- a/assets/_primer/support/index.scss
+++ b/assets/scss/_primer/support/index.scss
diff --git a/assets/_primer/support/mixins/buttons.scss b/assets/scss/_primer/support/mixins/buttons.scss
index 4b6cbb3..4b6cbb3 100644
--- a/assets/_primer/support/mixins/buttons.scss
+++ b/assets/scss/_primer/support/mixins/buttons.scss
diff --git a/assets/_primer/support/mixins/layout.scss b/assets/scss/_primer/support/mixins/layout.scss
index a6d30cf..a6d30cf 100644
--- a/assets/_primer/support/mixins/layout.scss
+++ b/assets/scss/_primer/support/mixins/layout.scss
diff --git a/assets/_primer/support/mixins/misc.scss b/assets/scss/_primer/support/mixins/misc.scss
index ebdd32d..ebdd32d 100644
--- a/assets/_primer/support/mixins/misc.scss
+++ b/assets/scss/_primer/support/mixins/misc.scss
diff --git a/assets/_primer/support/mixins/typography.scss b/assets/scss/_primer/support/mixins/typography.scss
index 23ec0e3..23ec0e3 100644
--- a/assets/_primer/support/mixins/typography.scss
+++ b/assets/scss/_primer/support/mixins/typography.scss
diff --git a/assets/_primer/support/variables/color-system.scss b/assets/scss/_primer/support/variables/color-system.scss
index febc58b..febc58b 100644
--- a/assets/_primer/support/variables/color-system.scss
+++ b/assets/scss/_primer/support/variables/color-system.scss
diff --git a/assets/_primer/support/variables/colors.scss b/assets/scss/_primer/support/variables/colors.scss
index ffbf018..ffbf018 100644
--- a/assets/_primer/support/variables/colors.scss
+++ b/assets/scss/_primer/support/variables/colors.scss
diff --git a/assets/_primer/support/variables/layout.scss b/assets/scss/_primer/support/variables/layout.scss
index cec508c..cec508c 100644
--- a/assets/_primer/support/variables/layout.scss
+++ b/assets/scss/_primer/support/variables/layout.scss
diff --git a/assets/_primer/support/variables/misc.scss b/assets/scss/_primer/support/variables/misc.scss
index 30a8363..30a8363 100644
--- a/assets/_primer/support/variables/misc.scss
+++ b/assets/scss/_primer/support/variables/misc.scss
diff --git a/assets/_primer/support/variables/typography.scss b/assets/scss/_primer/support/variables/typography.scss
index dcb57a7..dcb57a7 100644
--- a/assets/_primer/support/variables/typography.scss
+++ b/assets/scss/_primer/support/variables/typography.scss
diff --git a/assets/_primer/utilities/layout.scss b/assets/scss/_primer/utilities/layout.scss
index 1b4da95..1b4da95 100644
--- a/assets/_primer/utilities/layout.scss
+++ b/assets/scss/_primer/utilities/layout.scss
diff --git a/assets/_var.scss b/assets/scss/_var.scss
index d473787..d473787 100644
--- a/assets/_var.scss
+++ b/assets/scss/_var.scss
diff --git a/assets/fuji.scss b/assets/scss/fuji.scss
index b9982c5..b9982c5 100644
--- a/assets/fuji.scss
+++ b/assets/scss/fuji.scss
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index f648160..7141a40 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -33,7 +33,7 @@
 {{ template "_internal/twitter_cards.html" . }}
 
 <!-- dep -->
-{{ $sass := resources.Get "fuji.scss" }}
+{{ $sass := resources.Get "scss/fuji.scss" }}
 {{ $options := (dict "targetPath" "assets/css/fuji.min.css" "outputStyle" "compressed" "enableSourceMap" true) }}
 {{ $style := $sass | resources.ToCSS $options }}
 <link rel="stylesheet" href="{{ $style.RelPermalink }}" />
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 220ee93..1e02812 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -1,11 +1,8 @@
 <script src="https://cdn.jsdelivr.net/npm/lazysizes@5.2.2/lazysizes.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/medium-zoom@1.0.5/dist/medium-zoom.min.js"></script>
-{{ if .Site.Params.customHighlight }}
-<script src="{{ .Site.Params.customHighlightURL | relURL }}"></script>
-{{ else }}
-<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.0.3/build/highlight.min.js"></script>
-{{ end }}
-<script src="{{ "/assets/js/fuji.dev.js" | relURL }}"></script>
+<script src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/components/prism-core.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/plugins/autoloader/prism-autoloader.min.js"></script>
+<script src="{{ "/assets/js/fuji.js" | relURL }}"></script>
 
 {{ with .Params.playerURL }}
 <script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js"></script>
diff --git a/static/assets/js/fuji.dev.js b/static/assets/js/fuji.js
index d6917a3..0a81db2 100644
--- a/static/assets/js/fuji.dev.js
+++ b/static/assets/js/fuji.js
@@ -85,9 +85,6 @@ if ($('body').attr('data-theme') === 'dark') {
     });
 }
 
-// init highlight.js
-hljs.initHighlighting();
-
 // if in post page and using utterances
 // add utterances comment loading indicator
 if ($('.post-loading').length >= 1) {