Skip to content

Commit b902cb7

Browse files
h-enkh-enk
committed
feat: migrate to highlight.js v11.0.1
1 parent 148c737 commit b902cb7

File tree

7 files changed

+94
-226
lines changed

7 files changed

+94
-226
lines changed

‎assets/js/highlight.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import hljs from 'highlight.js/lib/core';
33
import javascript from 'highlight.js/lib/languages/javascript';
44
import json from 'highlight.js/lib/languages/json';
55
import bash from 'highlight.js/lib/languages/bash';
6-
import htmlbars from 'highlight.js/lib/languages/htmlbars';
6+
import xml from 'highlight.js/lib/languages/xml';
77
import ini from 'highlight.js/lib/languages/ini';
88
import yaml from 'highlight.js/lib/languages/yaml';
99
import markdown from 'highlight.js/lib/languages/markdown';
1010

1111
hljs.registerLanguage('javascript', javascript);
1212
hljs.registerLanguage('json', json);
1313
hljs.registerLanguage('bash', bash);
14-
hljs.registerLanguage('html', htmlbars);
14+
hljs.registerLanguage('html', xml);
1515
hljs.registerLanguage('ini', ini);
1616
hljs.registerLanguage('toml', ini);
1717
hljs.registerLanguage('yaml', yaml);

‎assets/scss/app.scss‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@import "bootstrap/scss/bootstrap";
99

1010
/** Import highlight.js */
11-
// @import "highlight.js/scss/dracula";
11+
// @import "highlight.js/scss/github-dark-dimmed";
1212

1313
/** Import KaTeX */
1414
@import "katex/dist/katex";
@@ -17,11 +17,10 @@
1717
@import "common/fonts";
1818
@import "common/global";
1919
@import "common/dark";
20-
@import "components/doks";
21-
// @import "components/syntax";
22-
@import "components/code";
2320
@import "components/alerts";
2421
@import "components/buttons";
22+
@import "components/code";
23+
@import "components/syntax";
2524
@import "components/comments";
2625
@import "components/forms";
2726
@import "components/images";

‎assets/scss/components/_doks.scss‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎assets/scss/components/_syntax.scss‎

Lines changed: 61 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,62 @@
1-
/*!
2-
* GitHub Light v0.5.0
3-
* Copyright (c) 2012 - 2017 GitHub, Inc.
4-
* Licensed under MIT (https://github.com/primer/github-syntax-theme-generator/blob/master/LICENSE)
5-
*/
1+
/*
62
7-
.c1,
8-
.c /* comment, punctuation.definition.comment, string.comment */ {
9-
color: #6a737d;
10-
}
11-
12-
.v /* variable */,
13-
.smw /* sublimelinter.mark.warning */ {
14-
color: #e36209;
15-
}
16-
17-
// .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 */,
18-
.s .v /* string variable */ {
19-
color: #005cc5;
20-
}
21-
22-
.e /* entity */,
23-
.en /* entity.name */ {
24-
color: #6f42c1;
25-
}
26-
27-
.smi /* variable.parameter.function, storage.modifier.package, storage.modifier.import, storage.type.java, variable.other */,
28-
.s .s1 /* string source */ {
29-
color: #24292e;
30-
}
31-
32-
.ent /* entity.name.tag, markup.quote */ {
33-
color: #22863a;
34-
}
35-
36-
.k /* keyword, storage, storage.type */ {
37-
color: #d73a49;
38-
}
39-
40-
.s /* string */,
41-
.pds /* punctuation.definition.string, source.regexp, string.regexp.character-class */,
42-
.s .pse .s1 /* string punctuation.section.embedded source */,
43-
.sr /* string.regexp */,
44-
.sr .cce /* string.regexp constant.character.escape */,
45-
.sr .sre /* string.regexp source.ruby.embedded */,
46-
.sr .sra /* string.regexp string.regexp.arbitrary-repitition */ {
47-
color: #032f62;
48-
}
49-
50-
.bu /* invalid.broken, invalid.deprecated, invalid.unimplemented, message.error, brackethighlighter.unmatched, sublimelinter.mark.error */ {
51-
color: #b31d28;
52-
}
53-
54-
.ii /* invalid.illegal */ {
55-
color: #fafbfc;
56-
background-color: #b31d28;
57-
}
58-
59-
.c2 /* carriage-return */ {
60-
color: #fafbfc;
61-
background-color: #d73a49;
62-
}
63-
64-
.c2::before /* carriage-return */ {
65-
content: "^M";
66-
}
67-
68-
.sr .cce /* string.regexp constant.character.escape */ {
69-
font-weight: bold;
70-
color: #22863a;
71-
}
72-
73-
.ml /* markup.list */ {
74-
color: #735c0f;
75-
}
76-
77-
.mh /* markup.heading */,
78-
.mh .en /* markup.heading entity.name */,
79-
.ms /* meta.separator */ {
80-
font-weight: bold;
81-
color: #005cc5;
82-
}
83-
84-
.mi /* markup.italic */ {
85-
font-style: italic;
86-
color: #24292e;
87-
}
88-
89-
.mb /* markup.bold */ {
90-
font-weight: bold;
91-
color: #24292e;
92-
}
93-
94-
.md /* markup.deleted, meta.diff.header.from-file, punctuation.definition.deleted */ {
95-
color: #b31d28;
96-
background-color: #ffeef0;
97-
}
98-
99-
.mi1 /* markup.inserted, meta.diff.header.to-file, punctuation.definition.inserted */ {
100-
color: #22863a;
101-
background-color: #f0fff4;
102-
}
103-
104-
.mc /* markup.changed, punctuation.definition.changed */ {
105-
color: #e36209;
106-
background-color: #ffebda;
107-
}
108-
109-
.mi2 /* markup.ignored, markup.untracked */ {
110-
color: #f6f8fa;
111-
background-color: #005cc5;
112-
}
113-
114-
.mdr /* meta.diff.range */ {
115-
font-weight: bold;
116-
color: #6f42c1;
117-
}
118-
119-
.ba /* brackethighlighter.tag, brackethighlighter.curly, brackethighlighter.round, brackethighlighter.square, brackethighlighter.angle, brackethighlighter.quote */ {
120-
color: #586069;
121-
}
122-
123-
.sg /* sublimelinter.gutter-mark */ {
124-
color: #959da5;
125-
}
126-
127-
.corl /* constant.other.reference.link, string.other.link */ {
128-
text-decoration: underline;
129-
color: #032f62;
130-
}
131-
3+
Based on Ascetic by (c) Ivan Sagalaev <[email protected]>
4+
5+
*/
6+
7+
.hljs {
8+
display: block;
9+
overflow-x: auto;
10+
padding: 1.25rem 1.5rem;
11+
background: $beige;
12+
color: $body-color;
13+
}
14+
15+
.hljs-string,
16+
.hljs-variable,
17+
.hljs-template-variable,
18+
.hljs-symbol,
19+
.hljs-bullet,
20+
.hljs-section,
21+
.hljs-addition,
22+
.hljs-attribute,
23+
.hljs-link {
24+
color: $pink-500;
25+
}
26+
27+
.hljs-comment,
28+
.hljs-quote,
29+
.hljs-meta,
30+
.hljs-deletion {
31+
color: #888;
32+
}
33+
34+
.hljs-keyword,
35+
.hljs-selector-tag,
36+
.hljs-section,
37+
.hljs-name,
38+
.hljs-type,
39+
.hljs-strong {
40+
font-weight: bold;
41+
}
42+
43+
.hljs-emphasis {
44+
font-style: italic;
45+
}
46+
47+
body.dark .hljs {
48+
background: $body-overlay-dark;
49+
color: $body-color-dark;
50+
}
51+
52+
body.dark .hljs-string,
53+
body.dark .hljs-variable,
54+
body.dark .hljs-template-variable,
55+
body.dark .hljs-symbol,
56+
body.dark .hljs-bullet,
57+
body.dark .hljs-section,
58+
body.dark .hljs-addition,
59+
body.dark .hljs-attribute,
60+
body.dark .hljs-link {
61+
color: $blue-300;
62+
}

‎config/postcss.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ module.exports = {
1919
'th',
2020
'td',
2121
...whitelister([
22-
'./assets/scss/components/_doks.scss',
2322
'./assets/scss/components/_code.scss',
23+
'./assets/scss/components/_syntax.scss',
2424
'./assets/scss/components/_search.scss',
2525
'./assets/scss/common/_dark.scss',
2626
'./node_modules/katex/dist/katex.css',

0 commit comments

Comments
 (0)