Commit b902cb70 authored by Henk Verlinde's avatar Henk Verlinde
Browse files

feat: migrate to highlight.js v11.0.1

parent 148c737a

assets/js/highlight.js

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ import hljs from 'highlight.js/lib/core'; 
import javascript from 'highlight.js/lib/languages/javascript';

import json from 'highlight.js/lib/languages/json';

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 yaml from 'highlight.js/lib/languages/yaml';

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('json', json);

hljs.registerLanguage('bash', bash);

hljs.registerLanguage('html', htmlbars);

hljs.registerLanguage('html', xml);

hljs.registerLanguage('ini', ini);

hljs.registerLanguage('toml', ini);

hljs.registerLanguage('yaml', yaml);

assets/scss/app.scss

+3 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
@import "bootstrap/scss/bootstrap";



/** Import highlight.js */

// @import "highlight.js/scss/dracula";

// @import "highlight.js/scss/github-dark-dimmed";



/** Import KaTeX */

@import "katex/dist/katex";
@@ -17,11 +17,10 @@ 
@import "common/fonts";

@import "common/global";

@import "common/dark";

@import "components/doks";

// @import "components/syntax";

@import "components/code";

@import "components/alerts";

@import "components/buttons";

@import "components/code";

@import "components/syntax";

@import "components/comments";

@import "components/forms";

@import "components/images";

assets/scss/components/_doks.scss

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
/*



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;

}

assets/scss/components/_syntax.scss

+61 −130
Original line number Diff line number Diff line 
/*!

 * 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,

 .c /* comment, punctuation.definition.comment, string.comment */ {

   color: #6a737d;

 }

 

 .v /* variable */,

 .smw /* sublimelinter.mark.warning */ {

   color: #e36209;

 }

 

 // .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;

 }

 

 .e /* entity */,

 .en /* entity.name */ {

   color: #6f42c1;

 }

 

 .smi /* variable.parameter.function, storage.modifier.package, storage.modifier.import, storage.type.java, variable.other */,

 .s .s1 /* string source */ {

   color: #24292e;

 }

 

 .ent /* entity.name.tag, markup.quote */ {

   color: #22863a;

 }

 

 .k /* keyword, storage, storage.type */ {

   color: #d73a49;

 }

 

 .s /* string */,

 .pds /* punctuation.definition.string, source.regexp, string.regexp.character-class */,

 .s .pse .s1 /* string punctuation.section.embedded source */,

 .sr /* string.regexp */,

 .sr .cce /* string.regexp constant.character.escape */,

 .sr .sre /* string.regexp source.ruby.embedded */,

 .sr .sra /* string.regexp string.regexp.arbitrary-repitition */ {

   color: #032f62;

 }

 

 .bu /* invalid.broken, invalid.deprecated, invalid.unimplemented, message.error, brackethighlighter.unmatched, sublimelinter.mark.error */ {

   color: #b31d28;

 }

 

 .ii /* invalid.illegal */ {

   color: #fafbfc;

   background-color: #b31d28;

 }

 

 .c2 /* carriage-return */ {

   color: #fafbfc;

   background-color: #d73a49;

 }

/*



 .c2::before /* carriage-return */ {

   content: "^M";

 }

 

 .sr .cce /* string.regexp constant.character.escape */ {

   font-weight: bold;

   color: #22863a;

 }

Based on Ascetic by (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org>



 .ml /* markup.list */ {

   color: #735c0f;

 }

*/



 .mh /* markup.heading */,

 .mh .en /* markup.heading entity.name */,

 .ms /* meta.separator */ {

.hljs {

  display: block;

  overflow-x: auto;

  padding: 1.25rem 1.5rem;

  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;

   color: #005cc5;

}



 .mi /* markup.italic */ {

.hljs-emphasis {

  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;

body.dark .hljs {

  background: $body-overlay-dark;

  color: $body-color-dark;

}



 .mi1 /* markup.inserted, meta.diff.header.to-file, punctuation.definition.inserted */ {

   color: #22863a;

   background-color: #f0fff4;

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;

}
 
 

 .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;

 }

 
 No newline at end of file

config/postcss.config.js

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ module.exports = { 
        'th',

        'td',

        ...whitelister([

          './assets/scss/components/_doks.scss',

          './assets/scss/components/_code.scss',

          './assets/scss/components/_syntax.scss',

          './assets/scss/components/_search.scss',

          './assets/scss/common/_dark.scss',

          './node_modules/katex/dist/katex.css',