diff --git a/src/webpage/highlighter/clike/lex.ts b/src/webpage/highlighter/clike/lex.ts index 34dde2c..0de49b9 100644 --- a/src/webpage/highlighter/clike/lex.ts +++ b/src/webpage/highlighter/clike/lex.ts @@ -25,7 +25,7 @@ function regex(config: clikeConf): RegExp { `(${RegExp.escape(config.multiLine)}(?:${matchOpts.join("|")})*(?:${RegExp.escape(config.multiLine)})?)`, ); } - conds.push(`\'(\\\\(.|\\n)|[^"\\n\\\\])*\'?`); + conds.push(`\'(\\\\(.|\\n)|[^\'\\n\\\\])*\'?`); conds.push(`"(\\\\(.|\\n)|[^"\\n\\\\])*"?`); if (config.hashComments) { conds.push("#.*"); diff --git a/src/webpage/style.css b/src/webpage/style.css index 6d4de24..31e754d 100644 --- a/src/webpage/style.css +++ b/src/webpage/style.css @@ -3388,33 +3388,34 @@ img.bigembedimg { } } ::highlight(highkeyword) { - color: yellow; + color: var(--code-keyword); } ::highlight(highnumber) { - color: orange; + color: var(--code-number); } ::highlight(highstring) { - color: red; + color: var(--code-string); } ::highlight(highsymbol) { - color: white; + color: var(--primary-text-prominent); font-weight: bold; } ::highlight(highcomment) { - color: green; + color: var(--code-comment); } ::highlight(highidentifier) { - color: white; + color: var(--primary-text); } ::highlight(highClass) { - color: #6741ff; + color: var(--code-class); } ::highlight(highProp) { - color: #33dcff; + color: var(--code-prop); } ::highlight(highFunc) { - color: #d564ff; + color: var(--code-func); } + #memberlisttoggle.svgicon { -moz-appearance: initial; &::before { diff --git a/src/webpage/themes.css b/src/webpage/themes.css index e373477..16eb6b3 100644 --- a/src/webpage/themes.css +++ b/src/webpage/themes.css @@ -12,6 +12,14 @@ --blue: #779bff; --grey: #b5b5b5; --update: var(--green); + + --code-keyword: yellow; + --code-number: orange; + --code-string: red; + --code-comment: green; + --code-class: #6741ff; + --code-prop: #33dcff; + --code-func: #d564ff; } /* Themes. See themes.txt */ @@ -88,6 +96,15 @@ --secondary-text-soft: #4c4c5a; --dock-bg: #d1d1df; --dock-hover: #b8b8d0; + + --code-bg: #fdfdf4; + --code-keyword: rgb(180, 180, 76); + --code-number: rgb(161, 109, 12); + --code-string: rgb(153, 4, 4); + --code-comment: rgb(9, 116, 9); + --code-class: #230a86; + --code-prop: #027d96; + --code-func: #6c0091; } .Light-theme {