qwik/qwik-site
qwik/qwik-site
2
1
Fork 1
Code Issues Pull Requests Releases Activity

Update marked and remove XHTML :(

Browse Source
This commit is contained in:
furo 2023-08-02 14:28:26 +02:00
parent df37bc4623
commit 5f1ae962d6
9 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/pages/articles.njk
View File

@ -1,8 +1,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en"> <html lang="en">
<head> <head>
{% include "templates/defaultTags.njk" %} {% include "templates/defaultTags.njk" %}
<link rel="stylesheet" type="text/css" href="/assets/css/sitemap.css" /> <link rel="stylesheet" type="text/css" href="/assets/css/sitemap.css">
<title>Site Map</title> <title>Site Map</title>
</head> </head>
<body> <body>

2
content/pages/articles/graphical-profile/colours.njk
View File

@ -3,7 +3,7 @@
{% import "components/color.njk" as color with context %} {% import "components/color.njk" as color with context %}
{% block head %} {% block head %}
<link rel="stylesheet" type="text/css" href="/assets/css/graphical-profile.css" /> <link rel="stylesheet" type="text/css" href="/assets/css/graphical-profile.css">
<title>qwik - colours</title> <title>qwik - colours</title>
{% endblock %} {% endblock %}

9
content/pages/index.njk
View File

@ -1,13 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en"> <html lang="en">
<head> <head>
{% include "templates/defaultTags.njk" %} {% include "templates/defaultTags.njk" %}
<link rel="stylesheet" type="text/css" href="/assets/css/landing.css" /> <link rel="stylesheet" type="text/css" href="/assets/css/landing.css">
<title>qwik</title> <title>qwik</title>
</head> </head>
<body> <body>
<div id="header"> <div id="header">
<img class="logo" src="/assets/images/logo.svg" alt="qwik logo" /> <img class="logo" src="/assets/images/logo.svg" alt="qwik logo">
<h1> <h1>
Welcome to <span style="color: var(--primary)">qwik</span><span style="color: var(--accent)">.</span><span style="color: var(--primary)">space</span>! Welcome to <span style="color: var(--primary)">qwik</span><span style="color: var(--accent)">.</span><span style="color: var(--primary)">space</span>!
</h1> </h1>

9
content/templates/article.njk
View File

@ -1,9 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en"> <html lang="en">
<head> <head>
{% include "./defaultTags.njk" %} {% include "./defaultTags.njk" %}
<link rel="stylesheet" href="/assets/css/article.css" /> <link rel="stylesheet" href="/assets/css/article.css">
<link rel="stylesheet" href="/assets/css/syntax.css" /> <link rel="stylesheet" href="/assets/css/syntax.css">
{% block head %} {% block head %}
<title>{{ serverName }}</title> <title>{{ serverName }}</title>
{% endblock %} {% endblock %}

9
content/templates/article_md.njk
View File

@ -1,9 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en"> <html lang="en">
<head> <head>
{% include "./defaultTags.njk" %} {% include "./defaultTags.njk" %}
<link rel="stylesheet" href="/assets/css/article.css" /> <link rel="stylesheet" href="/assets/css/article.css">
<link rel="stylesheet" href="/assets/css/syntax.css" /> <link rel="stylesheet" href="/assets/css/syntax.css">
{% block head %} {% block head %}
<title>{{ serverName }}</title> <title>{{ serverName }}</title>
{% endblock %} {% endblock %}

30
content/templates/defaultTags.njk
View File

@ -1,17 +1,17 @@
<meta http-equiv="Content-Type" content="application/xhtml+xml;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-touch-icon.png" /> <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png" /> <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/assets/favicons/favicon-16x16.png" /> <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicons/favicon-16x16.png">
<link rel="manifest" href="/assets/favicons/site.webmanifest" /> <link rel="manifest" href="/assets/favicons/site.webmanifest">
<link rel="mask-icon" href="/assets/favicons/safari-pinned-tab.svg" color="#3ddf89" /> <link rel="mask-icon" href="/assets/favicons/safari-pinned-tab.svg" color="#3ddf89">
<link rel="shortcut icon" href="/assets/favicons/favicon.ico" /> <link rel="shortcut icon" href="/assets/favicons/favicon.ico">
<meta name="msapplication-TileColor" content="#181833" /> <meta name="msapplication-TileColor" content="#181833">
<meta name="msapplication-config" content="/assets/favicons/browserconfig.xml" /> <meta name="msapplication-config" content="/assets/favicons/browserconfig.xml">
<meta name="theme-color" content="#3ddf89" /> <meta name="theme-color" content="#3ddf89">
<link rel="stylesheet" type="text/css" href="/assets/css/scaling.css" /> <link rel="stylesheet" type="text/css" href="/assets/css/scaling.css">
<link rel="stylesheet" type="text/css" href="/assets/css/colors.css" /> <link rel="stylesheet" type="text/css" href="/assets/css/colors.css">
<link rel="stylesheet" type="text/css" href="/assets/css/fonts.css" /> <link rel="stylesheet" type="text/css" href="/assets/css/fonts.css">
<link rel="stylesheet" type="text/css" href="/assets/css/theme.css" /> <link rel="stylesheet" type="text/css" href="/assets/css/theme.css">

9
content/templates/external_md.njk
View File

@ -1,9 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en"> <html lang="en">
<head> <head>
{% include "templates/defaultTags.njk" %} {% include "templates/defaultTags.njk" %}
<link rel="stylesheet" href="/assets/css/article.css" /> <link rel="stylesheet" href="/assets/css/article.css">
<link rel="stylesheet" href="/assets/css/syntax.css" /> <link rel="stylesheet" href="/assets/css/syntax.css">
<title>{{ externalMeta.title if externalMeta.title else serverName }}</title> <title>{{ externalMeta.title if externalMeta.title else serverName }}</title>
</head> </head>
<body> <body>

6
libs/nunjucksConfig.js
View File

@ -1,5 +1,5 @@
import njkMarkdown from 'nunjucks-markdown' import njkMarkdown from 'nunjucks-markdown'
import marked from 'marked' import { marked } from 'marked'
import { markedRenderer } from './markedRenderer.js' import { markedRenderer } from './markedRenderer.js'
import { utils } from './utils/utils.js' import { utils } from './utils/utils.js'
@ -24,7 +24,9 @@ export function nunjacksConfig(njk, express, Config) {
marked.use({ marked.use({
gfm: true, // Use GitHub formatting? gfm: true, // Use GitHub formatting?
renderer: markedRenderer, // Use my own custom rendering for som tags renderer: markedRenderer, // Use my own custom rendering for som tags
xhtml: true // Use XHTML for extra GAINZ! mangle: false, // Remove deprecated warning
headerIds: false, // Remove deprecated warning
headerPrefix: false // Remove deprecated warning
}) })
// Let nunjucks use markdown. // Let nunjucks use markdown.

2
package.json
View File

@ -21,7 +21,7 @@
"express": "^4.17.1", "express": "^4.17.1",
"highlight.js": "^11.2.0", "highlight.js": "^11.2.0",
"jsdom": "^16.7.0", "jsdom": "^16.7.0",
"marked": "^2.1.3", "marked": "^6.0.0",
"nunjucks": "^3.2.3", "nunjucks": "^3.2.3",
"nunjucks-markdown": "^2.0.1" "nunjucks-markdown": "^2.0.1"
} }