diff options
| -rw-r--r-- | app/directory.mjs | 2 | ||||
| -rw-r--r-- | app/static/css/globalstyles.css | 16 | ||||
| -rw-r--r-- | app/views/partials/header.ejs | 10 | ||||
| -rw-r--r-- | app/wikiparser.mjs | 4 |
4 files changed, 19 insertions, 13 deletions
diff --git a/app/directory.mjs b/app/directory.mjs index 4b5339c..38b05ca 100644 --- a/app/directory.mjs +++ b/app/directory.mjs @@ -66,7 +66,7 @@ export function rebuild() { } } primaryPages.sort((a, b) => { - return a.sortOrder - b.sortOrder; + return pages[a].sortOrder - pages[b].sortOrder; }); metadata.navbar = primaryPages; metadata.fileTreeBuildTime = new Date(); diff --git a/app/static/css/globalstyles.css b/app/static/css/globalstyles.css index c30d992..bdecaa6 100644 --- a/app/static/css/globalstyles.css +++ b/app/static/css/globalstyles.css @@ -17,7 +17,13 @@ html, body { } h1, h2, h3, h4, h5, h6 { - color: #fff; + color: #cc7832 +} + +.code-block { + background-color: #222; + border: solid 1px #333; + padding: 10px; } #navbar { @@ -51,7 +57,7 @@ h1, h2, h3, h4, h5, h6 { } .navbar-element > .highlight { - color: #ffff87; + color: #ffc66d; } #main-container { @@ -62,17 +68,17 @@ h1, h2, h3, h4, h5, h6 { #content { padding: 20px; max-width: 1200px; - background-color: #333; + background-color: #2b2b2b; margin: 0 auto; } a { - color: #ffff87; + color: #ffc66d; text-decoration: underline; } .highlight { - color: #ffff87; + color: #ffc66d; } .footer { diff --git a/app/views/partials/header.ejs b/app/views/partials/header.ejs index 1a8f7bf..67a23d4 100644 --- a/app/views/partials/header.ejs +++ b/app/views/partials/header.ejs @@ -1,11 +1,11 @@ <pre class="website-name"> -██ ███████ ██████ ███ ██ █████ ██████ ██████ ██████ ██████ ██ ███████ ██ ██ ██████ ██████ -██ ██ ██ ██ ████ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ -██ █████ ██ ██ ██ ██ ██ ███████ ██████ ██ ██ ██ ██ ██████ ██ ███████ ███████ ██ ██ ██████ -██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ -███████ ███████ ██████ ██ ████ ██ ██ ██ ██ ██████ ██████ ██████ ██ ███████ ██ ██ ██████ ██ + ██ ███████ ██████ ███ ██ █████ ██████ ██████ ██████ ██████ ██ ███████ ██ ██ ██████ ██████ + ██ ██ ██ ██ ████ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ + ██ █████ ██ ██ ██ ██ ██ ███████ ██████ ██ ██ ██ ██ ██████ ██ ███████ ███████ ██ ██ ██████ + ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ + ███████ ███████ ██████ ██ ████ ██ ██ ██ ██ ██████ ██████ ██████ ██ ███████ ██ ██ ██████ ██ </pre> diff --git a/app/wikiparser.mjs b/app/wikiparser.mjs index 4210bd1..cd13b18 100644 --- a/app/wikiparser.mjs +++ b/app/wikiparser.mjs @@ -238,8 +238,8 @@ export function parse(data) { ) // Nonstandard: ``code`` and ```code blocks``` - .replace(re(r` \`\`\` ([^\`]+?) \`\`\` `), '<pre>$1</pre>') - .replace(re(r` \`\` ([^\`]+?) \`\` `), '<code>$1</code>') + .replace(re(r` \`\`\` ([^\`]+?) \`\`\` `), '<pre class="code-block">$1</pre>') + .replace(re(r` <pre> ([^\`]+?) </pre> `), '<pre class="code-block">$1</pre>') // Spacing .replace(/(\r?\n){2}/g, '\n</p><p>\n') |