ResiLien/portails
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: migrate to highlight.js v11.0.1

Browse Source
This commit is contained in:
Henk Verlinde
2021-06-15 16:27:38 +02:00
parent 148c737a03
commit b902cb7071
7 changed files with 94 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/highlight.js
View File

@@ -3,7 +3,7 @@ import hljs from 'highlight.js/lib/core';
import javascript from 'highlight.js/lib/languages/javascript'; import javascript from 'highlight.js/lib/languages/javascript';
import json from 'highlight.js/lib/languages/json'; import json from 'highlight.js/lib/languages/json';
import bash from 'highlight.js/lib/languages/bash'; import bash from 'highlight.js/lib/languages/bash';
import htmlbars from 'highlight.js/lib/languages/htmlbars'; import xml from 'highlight.js/lib/languages/xml';
import ini from 'highlight.js/lib/languages/ini'; import ini from 'highlight.js/lib/languages/ini';
import yaml from 'highlight.js/lib/languages/yaml'; import yaml from 'highlight.js/lib/languages/yaml';
import markdown from 'highlight.js/lib/languages/markdown'; import markdown from 'highlight.js/lib/languages/markdown';
@@ -11,7 +11,7 @@ import markdown from 'highlight.js/lib/languages/markdown';
hljs.registerLanguage('javascript', javascript); hljs.registerLanguage('javascript', javascript);
hljs.registerLanguage('json', json); hljs.registerLanguage('json', json);
hljs.registerLanguage('bash', bash); hljs.registerLanguage('bash', bash);
hljs.registerLanguage('html', htmlbars); hljs.registerLanguage('html', xml);
hljs.registerLanguage('ini', ini); hljs.registerLanguage('ini', ini);
hljs.registerLanguage('toml', ini); hljs.registerLanguage('toml', ini);
hljs.registerLanguage('yaml', yaml); hljs.registerLanguage('yaml', yaml);

7
assets/scss/app.scss
View File

@@ -8,7 +8,7 @@
@import "bootstrap/scss/bootstrap"; @import "bootstrap/scss/bootstrap";
/** Import highlight.js */ /** Import highlight.js */
// @import "highlight.js/scss/dracula"; // @import "highlight.js/scss/github-dark-dimmed";
/** Import KaTeX */ /** Import KaTeX */
@import "katex/dist/katex"; @import "katex/dist/katex";
@@ -17,11 +17,10 @@
@import "common/fonts"; @import "common/fonts";
@import "common/global"; @import "common/global";
@import "common/dark"; @import "common/dark";
@import "components/doks";
// @import "components/syntax";
@import "components/code";
@import "components/alerts"; @import "components/alerts";
@import "components/buttons"; @import "components/buttons";
@import "components/code";
@import "components/syntax";
@import "components/comments"; @import "components/comments";
@import "components/forms"; @import "components/forms";
@import "components/images"; @import "components/images";

62
assets/scss/components/_doks.scss
View File

@@ -1,62 +0,0 @@
/*
Doks — based on Ascetic by (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org>
*/
.hljs {
display: block;
overflow-x: auto;
padding: 0.5em;
background: $beige;
color: $body-color;
}
.hljs-string,
.hljs-variable,
.hljs-template-variable,
.hljs-symbol,
.hljs-bullet,
.hljs-section,
.hljs-addition,
.hljs-attribute,
.hljs-link {
color: $pink-500;
}
.hljs-comment,
.hljs-quote,
.hljs-meta,
.hljs-deletion {
color: #888;
}
.hljs-keyword,
.hljs-selector-tag,
.hljs-section,
.hljs-name,
.hljs-type,
.hljs-strong {
font-weight: bold;
}
.hljs-emphasis {
font-style: italic;
}
body.dark .hljs {
background: $body-overlay-dark;
color: $body-color-dark;
}
body.dark .hljs-string,
body.dark .hljs-variable,
body.dark .hljs-template-variable,
body.dark .hljs-symbol,
body.dark .hljs-bullet,
body.dark .hljs-section,
body.dark .hljs-addition,
body.dark .hljs-attribute,
body.dark .hljs-link {
color: $blue-300;
}

191
assets/scss/components/_syntax.scss
View File

@@ -1,131 +1,62 @@
/*! /*
* GitHub Light v0.5.0
* Copyright (c) 2012 - 2017 GitHub, Inc.
* Licensed under MIT (https://github.com/primer/github-syntax-theme-generator/blob/master/LICENSE)
*/
.c1, Based on Ascetic by (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org>
.c /* comment, punctuation.definition.comment, string.comment */ {
color: #6a737d; */
}
.hljs {
.v /* variable */, display: block;
.smw /* sublimelinter.mark.warning */ { overflow-x: auto;
color: #e36209; padding: 1.25rem 1.5rem;
} background: $beige;
color: $body-color;
// .c1 /* constant, entity.name.constant, variable.other.constant, variable.language, support, meta.property-name, support.constant, support.variable, meta.module-reference, markup.raw, meta.diff.header, meta.output */, }
.s .v /* string variable */ {
color: #005cc5; .hljs-string,
} .hljs-variable,
.hljs-template-variable,
.e /* entity */, .hljs-symbol,
.en /* entity.name */ { .hljs-bullet,
color: #6f42c1; .hljs-section,
} .hljs-addition,
.hljs-attribute,
.smi /* variable.parameter.function, storage.modifier.package, storage.modifier.import, storage.type.java, variable.other */, .hljs-link {
.s .s1 /* string source */ { color: $pink-500;
color: #24292e; }
}
.hljs-comment,
.ent /* entity.name.tag, markup.quote */ { .hljs-quote,
color: #22863a; .hljs-meta,
} .hljs-deletion {
color: #888;
.k /* keyword, storage, storage.type */ { }
color: #d73a49;
} .hljs-keyword,
.hljs-selector-tag,
.s /* string */, .hljs-section,
.pds /* punctuation.definition.string, source.regexp, string.regexp.character-class */, .hljs-name,
.s .pse .s1 /* string punctuation.section.embedded source */, .hljs-type,
.sr /* string.regexp */, .hljs-strong {
.sr .cce /* string.regexp constant.character.escape */, font-weight: bold;
.sr .sre /* string.regexp source.ruby.embedded */, }
.sr .sra /* string.regexp string.regexp.arbitrary-repitition */ {
color: #032f62; .hljs-emphasis {
} font-style: italic;
}
.bu /* invalid.broken, invalid.deprecated, invalid.unimplemented, message.error, brackethighlighter.unmatched, sublimelinter.mark.error */ {
color: #b31d28; body.dark .hljs {
} background: $body-overlay-dark;
color: $body-color-dark;
.ii /* invalid.illegal */ { }
color: #fafbfc;
background-color: #b31d28; body.dark .hljs-string,
} body.dark .hljs-variable,
body.dark .hljs-template-variable,
.c2 /* carriage-return */ { body.dark .hljs-symbol,
color: #fafbfc; body.dark .hljs-bullet,
background-color: #d73a49; body.dark .hljs-section,
} body.dark .hljs-addition,
body.dark .hljs-attribute,
.c2::before /* carriage-return */ { body.dark .hljs-link {
content: "^M"; color: $blue-300;
} }
.sr .cce /* string.regexp constant.character.escape */ {
font-weight: bold;
color: #22863a;
}
.ml /* markup.list */ {
color: #735c0f;
}
.mh /* markup.heading */,
.mh .en /* markup.heading entity.name */,
.ms /* meta.separator */ {
font-weight: bold;
color: #005cc5;
}
.mi /* markup.italic */ {
font-style: italic;
color: #24292e;
}
.mb /* markup.bold */ {
font-weight: bold;
color: #24292e;
}
.md /* markup.deleted, meta.diff.header.from-file, punctuation.definition.deleted */ {
color: #b31d28;
background-color: #ffeef0;
}
.mi1 /* markup.inserted, meta.diff.header.to-file, punctuation.definition.inserted */ {
color: #22863a;
background-color: #f0fff4;
}
.mc /* markup.changed, punctuation.definition.changed */ {
color: #e36209;
background-color: #ffebda;
}
.mi2 /* markup.ignored, markup.untracked */ {
color: #f6f8fa;
background-color: #005cc5;
}
.mdr /* meta.diff.range */ {
font-weight: bold;
color: #6f42c1;
}
.ba /* brackethighlighter.tag, brackethighlighter.curly, brackethighlighter.round, brackethighlighter.square, brackethighlighter.angle, brackethighlighter.quote */ {
color: #586069;
}
.sg /* sublimelinter.gutter-mark */ {
color: #959da5;
}
.corl /* constant.other.reference.link, string.other.link */ {
text-decoration: underline;
color: #032f62;
}

2
config/postcss.config.js
View File

@@ -19,8 +19,8 @@ module.exports = {
'th', 'th',
'td', 'td',
...whitelister([ ...whitelister([
'./assets/scss/components/_doks.scss',
'./assets/scss/components/_code.scss', './assets/scss/components/_code.scss',
'./assets/scss/components/_syntax.scss',
'./assets/scss/components/_search.scss', './assets/scss/components/_search.scss',
'./assets/scss/common/_dark.scss', './assets/scss/common/_dark.scss',
'./node_modules/katex/dist/katex.css', './node_modules/katex/dist/katex.css',

52
package-lock.json generated
View File

@@ -18,7 +18,7 @@
"clipboard": "^2.0", "clipboard": "^2.0",
"eslint": "^7.28", "eslint": "^7.28",
"flexsearch": "^0.6", "flexsearch": "^0.6",
"highlight.js": "^10.7.2", "highlight.js": "^11.0",
"hugo-bin": "^0.71", "hugo-bin": "^0.71",
"instant.page": "^5.1", "instant.page": "^5.1",
"katex": "^0.13", "katex": "^0.13",
@@ -174,9 +174,9 @@
} }
}, },
"node_modules/@babel/helper-create-class-features-plugin": { "node_modules/@babel/helper-create-class-features-plugin": {
"version": "7.14.5", "version": "7.14.6",
"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.5.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz",
"integrity": "sha512-Uq9z2e7ZtcnDMirRqAGLRaLwJn+Lrh388v5ETrR3pALJnElVh2zqQmdbz4W2RUJYohAPh2mtyPUgyMHMzXMncQ==", "integrity": "sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/helper-annotate-as-pure": "^7.14.5", "@babel/helper-annotate-as-pure": "^7.14.5",
@@ -1350,9 +1350,9 @@
} }
}, },
"node_modules/@babel/plugin-transform-spread": { "node_modules/@babel/plugin-transform-spread": {
"version": "7.14.5", "version": "7.14.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.5.tgz", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
"integrity": "sha512-/3iqoQdiWergnShZYl0xACb4ADeYCJ7X/RgmwtXshn6cIvautRPAFzhd58frQlokLO6Jb4/3JXvmm6WNTPtiTw==", "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-plugin-utils": "^7.14.5",
@@ -1545,9 +1545,9 @@
} }
}, },
"node_modules/@babel/runtime": { "node_modules/@babel/runtime": {
"version": "7.14.5", "version": "7.14.6",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.5.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
"integrity": "sha512-121rumjddw9c3NCQ55KGkyE1h/nzWhU/owjhw0l4mQrkzz4x9SGS1X8gFLraHwX7td3Yo4QTL+qj0NcIzN87BA==", "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
@@ -7427,12 +7427,12 @@
} }
}, },
"node_modules/highlight.js": { "node_modules/highlight.js": {
"version": "10.7.3", "version": "11.0.1",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.0.1.tgz",
"integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", "integrity": "sha512-EqYpWyTF2s8nMfttfBA2yLKPNoZCO33pLS4MnbXQ4hECf1TKujCt1Kq7QAdrio7roL4+CqsfjqwYj4tYgq0pJQ==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "*" "node": ">=12.0.0"
} }
}, },
"node_modules/hmac-drbg": { "node_modules/hmac-drbg": {
@@ -15102,9 +15102,9 @@
} }
}, },
"@babel/helper-create-class-features-plugin": { "@babel/helper-create-class-features-plugin": {
"version": "7.14.5", "version": "7.14.6",
"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.5.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz",
"integrity": "sha512-Uq9z2e7ZtcnDMirRqAGLRaLwJn+Lrh388v5ETrR3pALJnElVh2zqQmdbz4W2RUJYohAPh2mtyPUgyMHMzXMncQ==", "integrity": "sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/helper-annotate-as-pure": "^7.14.5", "@babel/helper-annotate-as-pure": "^7.14.5",
@@ -15891,9 +15891,9 @@
} }
}, },
"@babel/plugin-transform-spread": { "@babel/plugin-transform-spread": {
"version": "7.14.5", "version": "7.14.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.5.tgz", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
"integrity": "sha512-/3iqoQdiWergnShZYl0xACb4ADeYCJ7X/RgmwtXshn6cIvautRPAFzhd58frQlokLO6Jb4/3JXvmm6WNTPtiTw==", "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-plugin-utils": "^7.14.5",
@@ -16041,9 +16041,9 @@
} }
}, },
"@babel/runtime": { "@babel/runtime": {
"version": "7.14.5", "version": "7.14.6",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.5.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
"integrity": "sha512-121rumjddw9c3NCQ55KGkyE1h/nzWhU/owjhw0l4mQrkzz4x9SGS1X8gFLraHwX7td3Yo4QTL+qj0NcIzN87BA==", "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
"dev": true, "dev": true,
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
@@ -20815,9 +20815,9 @@
"dev": true "dev": true
}, },
"highlight.js": { "highlight.js": {
"version": "10.7.3", "version": "11.0.1",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.0.1.tgz",
"integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", "integrity": "sha512-EqYpWyTF2s8nMfttfBA2yLKPNoZCO33pLS4MnbXQ4hECf1TKujCt1Kq7QAdrio7roL4+CqsfjqwYj4tYgq0pJQ==",
"dev": true "dev": true
}, },
"hmac-drbg": { "hmac-drbg": {

2
package.json
View File

@@ -46,7 +46,7 @@
"clipboard": "^2.0", "clipboard": "^2.0",
"eslint": "^7.28", "eslint": "^7.28",
"flexsearch": "^0.6", "flexsearch": "^0.6",
"highlight.js": "^10.7.2", "highlight.js": "^11.0",
"hugo-bin": "^0.71", "hugo-bin": "^0.71",
"instant.page": "^5.1", "instant.page": "^5.1",
"katex": "^0.13", "katex": "^0.13",