From f5fffcc6c795c66f321d158a166166de9830132d Mon Sep 17 00:00:00 2001 From: Craig Box Date: Thu, 5 Dec 2024 11:33:06 +1300 Subject: [PATCH 1/5] Upgrade JS versions --- assets/sass/themes/_dark-theme-syntax.scss | 77 ++--- assets/sass/themes/_light-theme-syntax.scss | 42 +-- netlify.toml | 8 +- src/ts/prism.js | 345 +------------------- 4 files changed, 69 insertions(+), 403 deletions(-) diff --git a/assets/sass/themes/_dark-theme-syntax.scss b/assets/sass/themes/_dark-theme-syntax.scss index add377eadcd01..aa1626d67e8c0 100644 --- a/assets/sass/themes/_dark-theme-syntax.scss +++ b/assets/sass/themes/_dark-theme-syntax.scss @@ -1,74 +1,69 @@ -// PrismJS 1.14.0 -// http://prismjs.com/download.html#themes=prism-tomorrow&languages=clike+javascript+bash+docker+go+java+protobuf+python+yaml -// -// prism.js tomorrow night eighties for JavaScript, CoffeeScript, CSS and HTML -// Based on https://github.com/chriskempson/tomorrow-theme -// @author Rose Pritchard +/* PrismJS 1.29.0 +https://prismjs.com/download.html#themes=prism-dark&languages=markup+css+clike+javascript */ +/** + * prism.js Dark theme for JavaScript, CSS and HTML + * Based on the slides of the talk “/Reg(exp){2}lained/” + * @author Lea Verou + */ .dark-theme { .token.comment, - .token.block-comment, .token.prolog, .token.doctype, .token.cdata { - color: #999; + color: hsl(30, 20%, 50%); } .token.punctuation { - color: #ccc; + opacity: .7; } - .token.tag, - .token.attr-name, - .token.namespace, - .token.deleted { - color: #e2777a; - } - - .token.function-name { - color: #6196cc; + .token.namespace { + opacity: .7; } + .token.property, + .token.tag, .token.boolean, .token.number, - .token.function { - color: #f08d49; - } - - .token.property, - .token.class-name, .token.constant, .token.symbol { - color: #f8c555; + color: hsl(350, 40%, 70%); } .token.selector, - .token.important, - .token.atrule, - .token.keyword, - .token.builtin { - color: #dda9d8; - } - + .token.attr-name, .token.string, .token.char, - .token.attr-value, - .token.regex, - .token.variable { - color: #7ec699; + .token.builtin, + .token.inserted { + color: hsl(75, 70%, 60%); } .token.operator, .token.entity, - .token.url { - color: #67cdcc; + .token.url, + .language-css .token.string, + .style .token.string, + .token.variable { + color: hsl(40, 90%, 60%); + } + + .token.atrule, + .token.attr-value, + .token.keyword { + color: hsl(350, 40%, 70%); + } + + .token.regex, + .token.important { + color: #e90; } .token.important, .token.bold { font-weight: bold; } - .token.italic { font-style: italic; } @@ -77,7 +72,7 @@ cursor: help; } - .token.inserted { - color: green; + .token.deleted { + color: red; } } diff --git a/assets/sass/themes/_light-theme-syntax.scss b/assets/sass/themes/_light-theme-syntax.scss index 57f569042a83f..95d5ff396b3e9 100644 --- a/assets/sass/themes/_light-theme-syntax.scss +++ b/assets/sass/themes/_light-theme-syntax.scss @@ -1,23 +1,24 @@ -// PrismJS 1.14.0 -// http://prismjs.com/download.html#themes=prism&languages=clike+javascript+bash+docker+go+java+protobuf+python+yaml -// -// prism.js default theme for JavaScript, CSS and HTML -// Based on dabblet (http://dabblet.com) -// @author Lea Verou +/* PrismJS 1.29.0 +https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */ +/** + * prism.js default theme for JavaScript, CSS and HTML + * Based on dabblet (http://dabblet.com) + * @author Lea Verou + */ .token.comment, .token.prolog, .token.doctype, .token.cdata { - color: slategray; + color: slategray; } .token.punctuation { - color: #999; + color: #999; } -.namespace { - opacity: .7; +.token.namespace { + opacity: .7; } .token.property, @@ -27,7 +28,7 @@ .token.constant, .token.symbol, .token.deleted { - color: #905; + color: #905; } .token.selector, @@ -36,7 +37,7 @@ .token.char, .token.builtin, .token.inserted { - color: #690; + color: #690; } .token.operator, @@ -44,36 +45,37 @@ .token.url, .language-css .token.string, .style .token.string { - color: $textCodeColor; + color: $textCodeColor; + /* This background color was intended by the author of this theme. */ + background: hsla(0, 0%, 100%, .5); } .token.atrule, .token.attr-value, .token.keyword { - color: #07a; + color: #07a; } .token.function, .token.class-name { - color: $textCodeColor; + color: $textCodeColor; } .token.regex, .token.important, .token.variable { - color: #516baa; + color: #e90; } .token.important, .token.bold { - font-weight: bold; + font-weight: bold; } - .token.italic { - font-style: italic; + font-style: italic; } .token.entity { - cursor: help; + cursor: help; } diff --git a/netlify.toml b/netlify.toml index 9458eae5cfa0f..5de66e340e12d 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,11 +3,11 @@ [build.environment] HUGO_VERSION = "0.139.3" - NODE_VERSION = "18.18.2" + NODE_VERSION = "20.18.0" BUILD_WITH_CONTAINER = "0" - GO_VERSION = "1.21.3" - PYTHON_VERSION = "3.8" - RUBY_VERSION = "3.0.6" + GO_VERSION = "1.23.3" + PYTHON_VERSION = "3.12.3" + RUBY_VERSION = "3.2" [[headers]] for = "/*" diff --git a/src/ts/prism.js b/src/ts/prism.js index 15ebc7ac7bcec..6adbc139b37b4 100644 --- a/src/ts/prism.js +++ b/src/ts/prism.js @@ -1,338 +1,7 @@ -/* PrismJS 1.14.0 -https://prismjs.com/download.html#themes=prism&languages=clike+javascript+bash+docker+go+java+json+protobuf+python+yaml */ -var _self = "undefined" != typeof window ? window : "undefined" != typeof WorkerGlobalScope && self instanceof WorkerGlobalScope ? self : {}, - Prism = function () { - var e = /\blang(?:uage)?-([\w-]+)\b/i, t = 0, n = _self.Prism = { - manual: _self.Prism && _self.Prism.manual, - disableWorkerMessageHandler: _self.Prism && _self.Prism.disableWorkerMessageHandler, - util: { - encode: function (e) { - return e instanceof r ? new r(e.type, n.util.encode(e.content), e.alias) : "Array" === n.util.type(e) ? e.map(n.util.encode) : e.replace(/&/g, "&").replace(/ e.length) return; - if (!(w instanceof s)) { - if (m && b != t.length - 1) { - h.lastIndex = k; - var _ = h.exec(e); - if (!_) break; - for (var j = _.index + (d ? _[1].length : 0), P = _.index + _[0].length, A = b, x = k, O = t.length; O > A && (P > x || !t[A].type && !t[A - 1].greedy); ++A) x += t[A].length, j >= x && (++b, k = x); - if (t[b] instanceof s) continue; - I = A - b, w = e.slice(k, x), _.index -= k - } else { - h.lastIndex = 0; - var _ = h.exec(w), I = 1 - } - if (_) { - d && (p = _[1] ? _[1].length : 0); - var j = _.index + p, _ = _[0].slice(p), P = j + _.length, N = w.slice(0, j), S = w.slice(P), C = [b, I]; - N && (++b, k += N.length, C.push(N)); - var E = new s(u, f ? n.tokenize(_, f) : _, y, _, m); - if (C.push(E), S && C.push(S), Array.prototype.splice.apply(t, C), 1 != I && n.matchGrammar(e, t, r, b, k, !0, u), i) break - } else if (i) break - } - } - } - } - }, - tokenize: function (e, t) { - var r = [e], a = t.rest; - if (a) { - for (var l in a) t[l] = a[l]; - delete t.rest - } - return n.matchGrammar(e, r, t, 0, 0, !1), r - }, - hooks: { - all: {}, add: function (e, t) { - var r = n.hooks.all; - r[e] = r[e] || [], r[e].push(t) - }, run: function (e, t) { - var r = n.hooks.all[e]; - if (r && r.length) for (var a, l = 0; a = r[l++];) a(t) - } - } - }, r = n.Token = function (e, t, n, r, a) { - this.type = e, this.content = t, this.alias = n, this.length = 0 | (r || "").length, this.greedy = !!a - }; - if (r.stringify = function (e, t, a) { - if ("string" == typeof e) return e; - if ("Array" === n.util.type(e)) return e.map(function (n) { - return r.stringify(n, t, e) - }).join(""); - var l = {type: e.type, content: r.stringify(e.content, t, a), tag: "span", classes: ["token", e.type], attributes: {}, language: t, parent: a}; - if (e.alias) { - var i = "Array" === n.util.type(e.alias) ? e.alias : [e.alias]; - Array.prototype.push.apply(l.classes, i) - } - n.hooks.run("wrap", l); - var o = Object.keys(l.attributes).map(function (e) { - return e + '="' + (l.attributes[e] || "").replace(/"/g, """) + '"' - }).join(" "); - return "<" + l.tag + ' class="' + l.classes.join(" ") + '"' + (o ? " " + o : "") + ">" + l.content + "" - }, !_self.document) return _self.addEventListener ? (n.disableWorkerMessageHandler || _self.addEventListener("message", function (e) { - var t = JSON.parse(e.data), r = t.language, a = t.code, l = t.immediateClose; - _self.postMessage(n.highlight(a, n.languages[r], r)), l && _self.close() - }, !1), _self.Prism) : _self.Prism; - var a = document.currentScript || [].slice.call(document.getElementsByTagName("script")).pop(); - return a && (n.filename = a.src, n.manual || a.hasAttribute("data-manual") || ("loading" !== document.readyState ? window.requestAnimationFrame ? window.requestAnimationFrame(n.highlightAll) : window.setTimeout(n.highlightAll, 16) : document.addEventListener("DOMContentLoaded", n.highlightAll))), _self.Prism - }(); -"undefined" != typeof module && module.exports && (module.exports = Prism), "undefined" != typeof global && (global.Prism = Prism); -Prism.languages.clike = { - comment: [{pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/, lookbehind: !0}, {pattern: /(^|[^\\:])\/\/.*/, lookbehind: !0, greedy: !0}], - string: {pattern: /(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/, greedy: !0}, - "class-name": { - pattern: /((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[\w.\\]+/i, - lookbehind: !0, - inside: {punctuation: /[.\\]/} - }, - keyword: /\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/, - "boolean": /\b(?:true|false)\b/, - "function": /[a-z0-9_]+(?=\()/i, - number: /\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i, - operator: /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/, - punctuation: /[{}[\];(),.:]/ -}; -Prism.languages.javascript = Prism.languages.extend("clike", { - keyword: /\b(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/, - number: /\b(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+|NaN|Infinity)\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/, - "function": /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\()/i, - operator: /-[-=]?|\+[+=]?|!=?=?|<>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/ -}), Prism.languages.insertBefore("javascript", "keyword", { - regex: { - pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[[^\]\r\n]+]|\\.|[^\/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/, - lookbehind: !0, - greedy: !0 - }, - "function-variable": { - pattern: /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=\s*(?:function\b|(?:\([^()]*\)|[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/i, - alias: "function" - }, - constant: /\b[A-Z][A-Z\d_]*\b/ -}), Prism.languages.insertBefore("javascript", "string", { - "template-string": { - pattern: /`(?:\\[\s\S]|[^\\`])*`/, - greedy: !0, - inside: { - interpolation: { - pattern: /\$\{[^}]+\}/, - inside: {"interpolation-punctuation": {pattern: /^\$\{|\}$/, alias: "punctuation"}, rest: Prism.languages.javascript} - }, string: /[\s\S]+/ - } - } -}), Prism.languages.markup && Prism.languages.insertBefore("markup", "tag", { - script: { - pattern: /()[\s\S]*?(?=<\/script>)/i, - lookbehind: !0, - inside: Prism.languages.javascript, - alias: "language-javascript", - greedy: !0 - } -}), Prism.languages.js = Prism.languages.javascript; -!function (e) { - var t = { - variable: [{ - pattern: /\$?\(\([\s\S]+?\)\)/, - inside: { - variable: [{pattern: /(^\$\(\([\s\S]+)\)\)/, lookbehind: !0}, /^\$\(\(/], - number: /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee]-?\d+)?/, - operator: /--?|-=|\+\+?|\+=|!=?|~|\*\*?|\*=|\/=?|%=?|<<=?|>>=?|<=?|>=?|==?|&&?|&=|\^=?|\|\|?|\|=|\?|:/, - punctuation: /\(\(?|\)\)?|,|;/ - } - }, {pattern: /\$\([^)]+\)|`[^`]+`/, greedy: !0, inside: {variable: /^\$\(|^`|\)$|`$/}}, /\$(?:[\w#?*!@]+|\{[^}]+\})/i] - }; - e.languages.bash = { - shebang: {pattern: /^#!\s*\/bin\/bash|^#!\s*\/bin\/sh/, alias: "important"}, - comment: {pattern: /(^|[^"{\\])#.*/, lookbehind: !0}, - string: [{ - pattern: /((?:^|[^<])<<\s*)["']?(\w+?)["']?\s*\r?\n(?:[\s\S])*?\r?\n\2/, - lookbehind: !0, - greedy: !0, - inside: t - }, {pattern: /(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1/, greedy: !0, inside: t}], - variable: t.variable, - "function": { - pattern: /(^|[\s;|&])(?:helm|docker|istioctl|curl|kubectl|alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|enable|env|ethtool|eval|exec|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|npm|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)(?=$|[\s;|&])/, - lookbehind: !0 - }, - keyword: { - pattern: /(^|[\s;|&])(?:let|:|\.|if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)(?=$|[\s;|&])/, - lookbehind: !0 - }, - "boolean": {pattern: /(^|[\s;|&])(?:true|false)(?=$|[\s;|&])/, lookbehind: !0}, - operator: /&&?|\|\|?|==?|!=?|<<>|<=?|>=?|=~/, - punctuation: /\$?\(\(?|\)\)?|\.\.|[{}[\];]/ - }; - var a = t.variable[1].inside; - a.string = e.languages.bash.string, a["function"] = e.languages.bash["function"], a.keyword = e.languages.bash.keyword, a.boolean = e.languages.bash.boolean, a.operator = e.languages.bash.operator, a.punctuation = e.languages.bash.punctuation, e.languages.shell = e.languages.bash -}(Prism); -Prism.languages.docker = { - keyword: { - pattern: /(^\s*)(?:ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|ONBUILD|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)(?=\s)/im, - lookbehind: !0 - }, string: /("|')(?:(?!\1)[^\\\r\n]|\\(?:\r\n|[\s\S]))*\1/, comment: /#.*/, punctuation: /---|\.\.\.|[:[\]{}\-,|>?]/ -}, Prism.languages.dockerfile = Prism.languages.docker; -Prism.languages.go = Prism.languages.extend("clike", { - keyword: /\b(?:break|case|chan|const|continue|default|defer|else|fallthrough|for|func|go(?:to)?|if|import|interface|map|package|range|return|select|struct|switch|type|var)\b/, - builtin: /\b(?:bool|byte|complex(?:64|128)|error|float(?:32|64)|rune|string|u?int(?:8|16|32|64)?|uintptr|append|cap|close|complex|copy|delete|imag|len|make|new|panic|print(?:ln)?|real|recover)\b/, - "boolean": /\b(?:_|iota|nil|true|false)\b/, - operator: /[*\/%^!=]=?|\+[=+]?|-[=-]?|\|[=|]?|&(?:=|&|\^=?)?|>(?:>=?|=)?|<(?:<=?|=|-)?|:=|\.\.\./, - number: /(?:\b0x[a-f\d]+|(?:\b\d+\.?\d*|\B\.\d+)(?:e[-+]?\d+)?)i?/i, - string: {pattern: /(["'`])(\\[\s\S]|(?!\1)[^\\])*\1/, greedy: !0} -}), delete Prism.languages.go["class-name"]; -Prism.languages.java = Prism.languages.extend("clike", { - keyword: /\b(?:abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while)\b/, - number: /\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp-]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?[df]?/i, - operator: {pattern: /(^|[^.])(?:\+[+=]?|-[-=]?|!=?|<>?>?=?|==?|&[&=]?|\|[|=]?|\*=?|\/=?|%=?|\^=?|[?:~])/m, lookbehind: !0} -}), Prism.languages.insertBefore("java", "function", { - annotation: { - alias: "punctuation", - pattern: /(^|[^.])@\w+/, - lookbehind: !0 - } -}), Prism.languages.insertBefore("java", "class-name", { - generics: { - pattern: /<\s*\w+(?:\.\w+)?(?:\s*,\s*\w+(?:\.\w+)?)*>/i, - alias: "function", - inside: {keyword: Prism.languages.java.keyword, punctuation: /[<>(),.:]/} - } -}); -Prism.languages.json = { - property: /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/i, - string: {pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/, greedy: !0}, - number: /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/, - punctuation: /[{}[\]);,]/, - operator: /:/g, - "boolean": /\b(?:true|false)\b/i, - "null": /\bnull\b/i -}, Prism.languages.jsonp = Prism.languages.json; -Prism.languages.protobuf = Prism.languages.extend("clike", { - keyword: /\b(?:package|import|message|enum)\b/, - builtin: /\b(?:required|repeated|optional|reserved)\b/, - primitive: {pattern: /\b(?:double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)\b/, alias: "symbol"} -}); -Prism.languages.python = { - comment: {pattern: /(^|[^\\])#.*/, lookbehind: !0}, - "triple-quoted-string": {pattern: /("""|''')[\s\S]+?\1/, greedy: !0, alias: "string"}, - string: {pattern: /("|')(?:\\.|(?!\1)[^\\\r\n])*\1/, greedy: !0}, - "function": {pattern: /((?:^|\s)def[ \t]+)[a-zA-Z_]\w*(?=\s*\()/g, lookbehind: !0}, - "class-name": {pattern: /(\bclass\s+)\w+/i, lookbehind: !0}, - keyword: /\b(?:as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|pass|print|raise|return|try|while|with|yield)\b/, - builtin: /\b(?:__import__|abs|all|any|apply|ascii|basestring|bin|bool|buffer|bytearray|bytes|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|memoryview|min|next|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|unichr|unicode|vars|xrange|zip)\b/, - "boolean": /\b(?:True|False|None)\b/, - number: /(?:\b(?=\d)|\B(?=\.))(?:0[bo])?(?:(?:\d|0x[\da-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i, - operator: /[-+%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]|\b(?:or|and|not)\b/, - punctuation: /[{}[\];(),.:]/ -}; -Prism.languages.yaml = { - scalar: { - pattern: /([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/, - lookbehind: !0, - alias: "string" - }, - comment: /#.*/, - key: {pattern: /(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/, lookbehind: !0, alias: "atrule"}, - directive: {pattern: /(^[ \t]*)%.+/m, lookbehind: !0, alias: "important"}, - datetime: { - pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ \t]+)\d\d?:\d{2}:\d{2}(?:\.\d*)?[ \t]*(?:Z|[-+]\d\d?(?::\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(?::\d{2}(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m, - lookbehind: !0, - alias: "number" - }, - "boolean": {pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im, lookbehind: !0, alias: "important"}, - "null": {pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im, lookbehind: !0, alias: "important"}, - string: {pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m, lookbehind: !0, greedy: !0}, - number: { - pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im, - lookbehind: !0 - }, - tag: /![^\s]+/, - important: /[&*][\w]+/, - punctuation: /---|[:[\]{}\-,|>?]|\.\.\./ -}; +/* PrismJS 1.29.0 +https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */ +var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(e){var n=/(?:^|\s)lang(?:uage)?-([\w-]+)(?=\s|$)/i,t=0,r={},a={manual:e.Prism&&e.Prism.manual,disableWorkerMessageHandler:e.Prism&&e.Prism.disableWorkerMessageHandler,util:{encode:function e(n){return n instanceof i?new i(n.type,e(n.content),n.alias):Array.isArray(n)?n.map(e):n.replace(/&/g,"&").replace(/=g.reach);A+=w.value.length,w=w.next){var E=w.value;if(n.length>e.length)return;if(!(E instanceof i)){var P,L=1;if(y){if(!(P=l(b,A,e,m))||P.index>=e.length)break;var S=P.index,O=P.index+P[0].length,j=A;for(j+=w.value.length;S>=j;)j+=(w=w.next).value.length;if(A=j-=w.value.length,w.value instanceof i)continue;for(var C=w;C!==n.tail&&(jg.reach&&(g.reach=W);var z=w.prev;if(_&&(z=u(n,z,_),A+=_.length),c(n,z,L),w=u(n,z,new i(f,p?a.tokenize(N,p):N,k,N)),M&&u(n,w,M),L>1){var I={cause:f+","+d,reach:W};o(e,n,t,w.prev,A,I),g&&I.reach>g.reach&&(g.reach=I.reach)}}}}}}function s(){var e={value:null,prev:null,next:null},n={value:null,prev:e,next:null};e.next=n,this.head=e,this.tail=n,this.length=0}function u(e,n,t){var r=n.next,a={value:t,prev:n,next:r};return n.next=a,r.prev=a,e.length++,a}function c(e,n,t){for(var r=n.next,a=0;a"+i.content+""},!e.document)return e.addEventListener?(a.disableWorkerMessageHandler||e.addEventListener("message",(function(n){var t=JSON.parse(n.data),r=t.language,i=t.code,l=t.immediateClose;e.postMessage(a.highlight(i,a.languages[r],r)),l&&e.close()}),!1),a):a;var g=a.util.currentScript();function f(){a.manual||a.highlightAll()}if(g&&(a.filename=g.src,g.hasAttribute("data-manual")&&(a.manual=!0)),!a.manual){var h=document.readyState;"loading"===h||"interactive"===h&&g&&g.defer?document.addEventListener("DOMContentLoaded",f):window.requestAnimationFrame?window.requestAnimationFrame(f):window.setTimeout(f,16)}return a}(_self);"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism); +Prism.languages.markup={comment:{pattern://,greedy:!0},prolog:{pattern:/<\?[\s\S]+?\?>/,greedy:!0},doctype:{pattern:/"'[\]]|"[^"]*"|'[^']*')+(?:\[(?:[^<"'\]]|"[^"]*"|'[^']*'|<(?!!--)|)*\]\s*)?>/i,greedy:!0,inside:{"internal-subset":{pattern:/(^[^\[]*\[)[\s\S]+(?=\]>$)/,lookbehind:!0,greedy:!0,inside:null},string:{pattern:/"[^"]*"|'[^']*'/,greedy:!0},punctuation:/^$|[[\]]/,"doctype-tag":/^DOCTYPE/i,name:/[^\s<>'"]+/}},cdata:{pattern://i,greedy:!0},tag:{pattern:/<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/,greedy:!0,inside:{tag:{pattern:/^<\/?[^\s>\/]+/,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"special-attr":[],"attr-value":{pattern:/=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/,inside:{punctuation:[{pattern:/^=/,alias:"attr-equals"},{pattern:/^(\s*)["']|["']$/,lookbehind:!0}]}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:[{pattern:/&[\da-z]{1,8};/i,alias:"named-entity"},/&#x?[\da-f]{1,8};/i]},Prism.languages.markup.tag.inside["attr-value"].inside.entity=Prism.languages.markup.entity,Prism.languages.markup.doctype.inside["internal-subset"].inside=Prism.languages.markup,Prism.hooks.add("wrap",(function(a){"entity"===a.type&&(a.attributes.title=a.content.replace(/&/,"&"))})),Object.defineProperty(Prism.languages.markup.tag,"addInlined",{value:function(a,e){var s={};s["language-"+e]={pattern:/(^$)/i,lookbehind:!0,inside:Prism.languages[e]},s.cdata=/^$/i;var t={"included-cdata":{pattern://i,inside:s}};t["language-"+e]={pattern:/[\s\S]+/,inside:Prism.languages[e]};var n={};n[a]={pattern:RegExp("(<__[^>]*>)(?:))*\\]\\]>|(?!)".replace(/__/g,(function(){return a})),"i"),lookbehind:!0,greedy:!0,inside:t},Prism.languages.insertBefore("markup","cdata",n)}}),Object.defineProperty(Prism.languages.markup.tag,"addAttribute",{value:function(a,e){Prism.languages.markup.tag.inside["special-attr"].push({pattern:RegExp("(^|[\"'\\s])(?:"+a+")\\s*=\\s*(?:\"[^\"]*\"|'[^']*'|[^\\s'\">=]+(?=[\\s>]))","i"),lookbehind:!0,inside:{"attr-name":/^[^\s=]+/,"attr-value":{pattern:/=[\s\S]+/,inside:{value:{pattern:/(^=\s*(["']|(?!["'])))\S[\s\S]*(?=\2$)/,lookbehind:!0,alias:[e,"language-"+e],inside:Prism.languages[e]},punctuation:[{pattern:/^=/,alias:"attr-equals"},/"|'/]}}}})}}),Prism.languages.html=Prism.languages.markup,Prism.languages.mathml=Prism.languages.markup,Prism.languages.svg=Prism.languages.markup,Prism.languages.xml=Prism.languages.extend("markup",{}),Prism.languages.ssml=Prism.languages.xml,Prism.languages.atom=Prism.languages.xml,Prism.languages.rss=Prism.languages.xml; +!function(s){var e=/(?:"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n])*')/;s.languages.css={comment:/\/\*[\s\S]*?\*\//,atrule:{pattern:RegExp("@[\\w-](?:[^;{\\s\"']|\\s+(?!\\s)|"+e.source+")*?(?:;|(?=\\s*\\{))"),inside:{rule:/^@[\w-]+/,"selector-function-argument":{pattern:/(\bselector\s*\(\s*(?![\s)]))(?:[^()\s]|\s+(?![\s)])|\((?:[^()]|\([^()]*\))*\))+(?=\s*\))/,lookbehind:!0,alias:"selector"},keyword:{pattern:/(^|[^\w-])(?:and|not|only|or)(?![\w-])/,lookbehind:!0}}},url:{pattern:RegExp("\\burl\\((?:"+e.source+"|(?:[^\\\\\r\n()\"']|\\\\[^])*)\\)","i"),greedy:!0,inside:{function:/^url/i,punctuation:/^\(|\)$/,string:{pattern:RegExp("^"+e.source+"$"),alias:"url"}}},selector:{pattern:RegExp("(^|[{}\\s])[^{}\\s](?:[^{};\"'\\s]|\\s+(?![\\s{])|"+e.source+")*(?=\\s*\\{)"),lookbehind:!0},string:{pattern:e,greedy:!0},property:{pattern:/(^|[^-\w\xA0-\uFFFF])(?!\s)[-_a-z\xA0-\uFFFF](?:(?!\s)[-\w\xA0-\uFFFF])*(?=\s*:)/i,lookbehind:!0},important:/!important\b/i,function:{pattern:/(^|[^-a-z0-9])[-a-z0-9]+(?=\()/i,lookbehind:!0},punctuation:/[(){};:,]/},s.languages.css.atrule.inside.rest=s.languages.css;var t=s.languages.markup;t&&(t.tag.addInlined("style","css"),t.tag.addAttribute("style","css"))}(Prism); +Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,lookbehind:!0,greedy:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":{pattern:/(\b(?:class|extends|implements|instanceof|interface|new|trait)\s+|\bcatch\s+\()[\w.\\]+/i,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:break|catch|continue|do|else|finally|for|function|if|in|instanceof|new|null|return|throw|try|while)\b/,boolean:/\b(?:false|true)\b/,function:/\b\w+(?=\()/,number:/\b0x[\da-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,operator:/[<>]=?|[!=]=?=?|--?|\+\+?|&&?|\|\|?|[?*/~^%]/,punctuation:/[{}[\];(),.:]/}; +Prism.languages.javascript=Prism.languages.extend("clike",{"class-name":[Prism.languages.clike["class-name"],{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$A-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\.(?:constructor|prototype))/,lookbehind:!0}],keyword:[{pattern:/((?:^|\})\s*)catch\b/,lookbehind:!0},{pattern:/(^|[^.]|\.\.\.\s*)\b(?:as|assert(?=\s*\{)|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,lookbehind:!0}],function:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,number:{pattern:RegExp("(^|[^\\w$])(?:NaN|Infinity|0[bB][01]+(?:_[01]+)*n?|0[oO][0-7]+(?:_[0-7]+)*n?|0[xX][\\dA-Fa-f]+(?:_[\\dA-Fa-f]+)*n?|\\d+(?:_\\d+)*n|(?:\\d+(?:_\\d+)*(?:\\.(?:\\d+(?:_\\d+)*)?)?|\\.\\d+(?:_\\d+)*)(?:[Ee][+-]?\\d+(?:_\\d+)*)?)(?![\\w$])"),lookbehind:!0},operator:/--|\+\+|\*\*=?|=>|&&=?|\|\|=?|[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?\?=?|\?\.?|[~:]/}),Prism.languages.javascript["class-name"][0].pattern=/(\b(?:class|extends|implements|instanceof|interface|new)\s+)[\w.\\]+/,Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:RegExp("((?:^|[^$\\w\\xA0-\\uFFFF.\"'\\])\\s]|\\b(?:return|yield))\\s*)/(?:(?:\\[(?:[^\\]\\\\\r\n]|\\\\.)*\\]|\\\\.|[^/\\\\\\[\r\n])+/[dgimyus]{0,7}|(?:\\[(?:[^[\\]\\\\\r\n]|\\\\.|\\[(?:[^[\\]\\\\\r\n]|\\\\.|\\[(?:[^[\\]\\\\\r\n]|\\\\.)*\\])*\\])*\\]|\\\\.|[^/\\\\\\[\r\n])+/[dgimyus]{0,7}v[dgimyus]{0,7})(?=(?:\\s|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:$|[\r\n,.;:})\\]]|//))"),lookbehind:!0,greedy:!0,inside:{"regex-source":{pattern:/^(\/)[\s\S]+(?=\/[a-z]*$)/,lookbehind:!0,alias:"language-regex",inside:Prism.languages.regex},"regex-delimiter":/^\/|\/$/,"regex-flags":/^[a-z]+$/}},"function-variable":{pattern:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)\s*=>))/,alias:"function"},parameter:[{pattern:/(function(?:\s+(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)?\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\))/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$a-z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*=>)/i,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/(\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*=>)/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*\s*)\(\s*|\]\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*\{)/,lookbehind:!0,inside:Prism.languages.javascript}],constant:/\b[A-Z](?:[A-Z_]|\dx?)*\b/}),Prism.languages.insertBefore("javascript","string",{hashbang:{pattern:/^#!.*/,greedy:!0,alias:"comment"},"template-string":{pattern:/`(?:\\[\s\S]|\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}|(?!\$\{)[^\\`])*`/,greedy:!0,inside:{"template-punctuation":{pattern:/^`|`$/,alias:"string"},interpolation:{pattern:/((?:^|[^\\])(?:\\{2})*)\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}/,lookbehind:!0,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}},"string-property":{pattern:/((?:^|[,{])[ \t]*)(["'])(?:\\(?:\r\n|[\s\S])|(?!\2)[^\\\r\n])*\2(?=\s*:)/m,lookbehind:!0,greedy:!0,alias:"property"}}),Prism.languages.insertBefore("javascript","operator",{"literal-property":{pattern:/((?:^|[,{])[ \t]*)(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*:)/m,lookbehind:!0,alias:"property"}}),Prism.languages.markup&&(Prism.languages.markup.tag.addInlined("script","javascript"),Prism.languages.markup.tag.addAttribute("on(?:abort|blur|change|click|composition(?:end|start|update)|dblclick|error|focus(?:in|out)?|key(?:down|up)|load|mouse(?:down|enter|leave|move|out|over|up)|reset|resize|scroll|select|slotchange|submit|unload|wheel)","javascript")),Prism.languages.js=Prism.languages.javascript; From 66e237368c164807aeb5663452265da8887735a0 Mon Sep 17 00:00:00 2001 From: Craig Box Date: Thu, 5 Dec 2024 11:38:01 +1300 Subject: [PATCH 2/5] try a more specific Ruby version --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 5de66e340e12d..b7c9a2b4f8b75 100644 --- a/netlify.toml +++ b/netlify.toml @@ -7,7 +7,7 @@ BUILD_WITH_CONTAINER = "0" GO_VERSION = "1.23.3" PYTHON_VERSION = "3.12.3" - RUBY_VERSION = "3.2" + RUBY_VERSION = "3.2.2" [[headers]] for = "/*" From 2e813ff6b0025c231ed568736ed80c1a2da45f48 Mon Sep 17 00:00:00 2001 From: Craig Box Date: Thu, 5 Dec 2024 11:44:32 +1300 Subject: [PATCH 3/5] test later versions of NPM packages --- Makefile.core.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index 8699f6b57f2f8..ccd63cd8fac49 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -139,16 +139,16 @@ archive-version: netlify_install: @npm init -y @npm install --omit=dev --global \ - sass@v1.52.1 \ - typescript@v4.7.2 \ - svgstore-cli@v1.3.2 \ - @babel/core@v7.18.2 \ - @babel/cli@v7.17.10 \ - @babel/preset-env@v7.18.2 + sass@v1.82.0 \ + typescript@v5.7.2 \ + svgstore-cli@v3.0.1 \ + @babel/core@v7.26.0 \ + @babel/cli@v7.25.9 \ + @babel/preset-env@v7.26.0 @npm install --omit=dev --save-dev \ babel-preset-minify@v0.5.2 @npm install --save \ - core-js@3.31.1 + core-js@3.39.0 netlify: netlify_install @scripts/gen_site.sh From 056ed2f3c155ef0c879e70d86828405177d6a4a1 Mon Sep 17 00:00:00 2001 From: Craig Box Date: Thu, 5 Dec 2024 11:50:46 +1300 Subject: [PATCH 4/5] fix svgstore-cli version --- Makefile.core.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index ccd63cd8fac49..ae87557d1b7b7 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -141,7 +141,7 @@ netlify_install: @npm install --omit=dev --global \ sass@v1.82.0 \ typescript@v5.7.2 \ - svgstore-cli@v3.0.1 \ + svgstore-cli@v2.0.1 \ @babel/core@v7.26.0 \ @babel/cli@v7.25.9 \ @babel/preset-env@v7.26.0 From 0954ca1772071a8888004a06e80be26a9577b36c Mon Sep 17 00:00:00 2001 From: Craig Box Date: Thu, 5 Dec 2024 12:00:23 +1300 Subject: [PATCH 5/5] fix lint --- assets/sass/themes/_dark-theme-syntax.scss | 97 +++++++++++---------- assets/sass/themes/_light-theme-syntax.scss | 13 ++- 2 files changed, 57 insertions(+), 53 deletions(-) diff --git a/assets/sass/themes/_dark-theme-syntax.scss b/assets/sass/themes/_dark-theme-syntax.scss index aa1626d67e8c0..2316af724d929 100644 --- a/assets/sass/themes/_dark-theme-syntax.scss +++ b/assets/sass/themes/_dark-theme-syntax.scss @@ -1,78 +1,83 @@ -/* PrismJS 1.29.0 -https://prismjs.com/download.html#themes=prism-dark&languages=markup+css+clike+javascript */ -/** - * prism.js Dark theme for JavaScript, CSS and HTML - * Based on the slides of the talk “/Reg(exp){2}lained/” - * @author Lea Verou - */ - +// PrismJS 1.29.0 +// https://prismjs.com/download.html#themes=prism-tomorrow&languages=clike+javascript+bash+docker+go+java+protobuf+python+yaml +// +// prism.js tomorrow night eighties for JavaScript, CoffeeScript, CSS and HTML +// Based on https://github.com/chriskempson/tomorrow-theme +// @author Rose Pritchard + .dark-theme { .token.comment, + .token.block-comment, .token.prolog, .token.doctype, .token.cdata { - color: hsl(30, 20%, 50%); + color: #999; } - + .token.punctuation { - opacity: .7; + color: #ccc; } - - .token.namespace { - opacity: .7; - } - - .token.property, + .token.tag, + .token.attr-name, + .token.namespace, + .token.deleted { + color: #e2777a; + } + + .token.function-name { + color: #6196cc; + } + .token.boolean, .token.number, + .token.function { + color: #f08d49; + } + + .token.property, + .token.class-name, .token.constant, .token.symbol { - color: hsl(350, 40%, 70%); + color: #f8c555; } - + .token.selector, - .token.attr-name, + .token.important, + .token.atrule, + .token.keyword, + .token.builtin { + color: #cc99cd; + } + .token.string, .token.char, - .token.builtin, - .token.inserted { - color: hsl(75, 70%, 60%); + .token.attr-value, + .token.regex, + .token.variable { + color: #7ec699; } - + .token.operator, .token.entity, - .token.url, - .language-css .token.string, - .style .token.string, - .token.variable { - color: hsl(40, 90%, 60%); - } - - .token.atrule, - .token.attr-value, - .token.keyword { - color: hsl(350, 40%, 70%); - } - - .token.regex, - .token.important { - color: #e90; + .token.url { + color: #67cdcc; } - + .token.important, .token.bold { font-weight: bold; } + .token.italic { font-style: italic; } - + .token.entity { cursor: help; } - - .token.deleted { - color: red; - } + + .token.inserted { + color: green; + } } diff --git a/assets/sass/themes/_light-theme-syntax.scss b/assets/sass/themes/_light-theme-syntax.scss index 95d5ff396b3e9..482286e86a924 100644 --- a/assets/sass/themes/_light-theme-syntax.scss +++ b/assets/sass/themes/_light-theme-syntax.scss @@ -1,10 +1,9 @@ -/* PrismJS 1.29.0 -https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */ -/** - * prism.js default theme for JavaScript, CSS and HTML - * Based on dabblet (http://dabblet.com) - * @author Lea Verou - */ +// PrismJS 1.29.0 +// https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript +// +// prism.js default theme for JavaScript, CSS and HTML +// Based on dabblet (http://dabblet.com) +// @author Lea Verou .token.comment, .token.prolog,