akemi/noway.moe
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Markdown: links to headers

Browse source
This commit is contained in:
Akemi Izuko 2023-12-28 00:37:59 -07:00
parent 57188b3cf7
commit a365ec04b6
Signed by: akemi
GPG key ID: 8DE0764E1809E9FC
4 changed files with 200 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
astro.config.mjs
View file

@ -4,7 +4,10 @@ import sitemap from '@astrojs/sitemap';
//import cloudflare from "@astrojs/cloudflare"; //import cloudflare from "@astrojs/cloudflare";
import remarkGfm from "remark-gfm"; import remarkGfm from "remark-gfm";
import remarkRehype from "remark-rehype"; import remarkRehype from "remark-rehype";
import rehypeSlug from "rehype-slug";
import rehypePrettyCode from "rehype-pretty-code"; import rehypePrettyCode from "rehype-pretty-code";
import rehypeAutolinkHeadings from "rehype-autolink-headings";
import { s } from "hastscript";
import json from "./public/themes/github_light.json" assert { type: "json" }; import json from "./public/themes/github_light.json" assert { type: "json" };
import tailwind from "@astrojs/tailwind"; import tailwind from "@astrojs/tailwind";
@ -42,7 +45,23 @@ export default defineConfig({
syntaxHighlight: false, syntaxHighlight: false,
remarkPlugins: [ remarkPlugins: [
remarkGfm, remarkGfm,
/* Conerts remark to rehype (md -> html) */
[remarkRehype, { clobberPrefix: "" }], [remarkRehype, { clobberPrefix: "" }],
/*
* rehypeSlug adds IDs to headings... which rehypeAutolinkHeadings then
* extends to <a> tags
*/
[rehypeSlug, {}],
[rehypeAutolinkHeadings, {
content(node) {
return [
s('svg', {viewBox: "0 0 16 16", class: "icon-link", width: "16", height: "16"}, [
s('path', {d: "m7.775 3.275 1.25-1.25a3.5 3.5 0 1 1 4.95 4.95l-2.5 2.5a3.5 3.5 0 0 1-4.95 0 .751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018 1.998 1.998 0 0 0 2.83 0l2.5-2.5a2.002 2.002 0 0 0-2.83-2.83l-1.25 1.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042Zm-4.69 9.64a1.998 1.998 0 0 0 2.83 0l1.25-1.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042l-1.25 1.25a3.5 3.5 0 1 1-4.95-4.95l2.5-2.5a3.5 3.5 0 0 1 4.95 0 .751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018 1.998 1.998 0 0 0-2.83 0l-2.5 2.5a1.998 1.998 0 0 0 0 2.83Z"})
])
]
}
}],
/* Does the syntax highlighting and parsing on code */
[rehypePrettyCode, options], [rehypePrettyCode, options],
], ],
//shikiConfig: { //shikiConfig: {

60
package-lock.json generated
View file

@ -13,7 +13,10 @@
"@astrojs/sitemap": "^3.0.3", "@astrojs/sitemap": "^3.0.3",
"@astrojs/tailwind": "^5.0.4", "@astrojs/tailwind": "^5.0.4",
"astro": "^4.0.7", "astro": "^4.0.7",
"hastscript": "^8.0.0",
"rehype-autolink-headings": "^7.1.0",
"rehype-pretty-code": "^0.12.3", "rehype-pretty-code": "^0.12.3",
"rehype-slug": "^6.0.0",
"remark-gfm": "^4.0.0", "remark-gfm": "^4.0.0",
"remark-rehype": "^11.0.0", "remark-rehype": "^11.0.0",
"sharp": "^0.33.1", "sharp": "^0.33.1",
@ -3359,6 +3362,30 @@
"url": "https://opencollective.com/unified" "url": "https://opencollective.com/unified"
} }
}, },
"node_modules/hast-util-heading-rank": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/hast-util-heading-rank/-/hast-util-heading-rank-3.0.0.tgz",
"integrity": "sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==",
"dependencies": {
"@types/hast": "^3.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/hast-util-is-element": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
"integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
"dependencies": {
"@types/hast": "^3.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/hast-util-parse-selector": { "node_modules/hast-util-parse-selector": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz", "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz",
@ -6093,6 +6120,23 @@
"url": "https://opencollective.com/unified" "url": "https://opencollective.com/unified"
} }
}, },
"node_modules/rehype-autolink-headings": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/rehype-autolink-headings/-/rehype-autolink-headings-7.1.0.tgz",
"integrity": "sha512-rItO/pSdvnvsP4QRB1pmPiNHUskikqtPojZKJPPPAVx9Hj8i8TwMBhofrrAYRhYOOBZH9tgmG5lPqDLuIWPWmw==",
"dependencies": {
"@types/hast": "^3.0.0",
"@ungap/structured-clone": "^1.0.0",
"hast-util-heading-rank": "^3.0.0",
"hast-util-is-element": "^3.0.0",
"unified": "^11.0.0",
"unist-util-visit": "^5.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/rehype-parse": { "node_modules/rehype-parse": {
"version": "9.0.0", "version": "9.0.0",
"resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-9.0.0.tgz", "resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-9.0.0.tgz",
@ -6140,6 +6184,22 @@
"url": "https://opencollective.com/unified" "url": "https://opencollective.com/unified"
} }
}, },
"node_modules/rehype-slug": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/rehype-slug/-/rehype-slug-6.0.0.tgz",
"integrity": "sha512-lWyvf/jwu+oS5+hL5eClVd3hNdmwM1kAC0BUvEGD19pajQMIzcNUd/k9GsfQ+FfECvX+JE+e9/btsKH0EjJT6A==",
"dependencies": {
"@types/hast": "^3.0.0",
"github-slugger": "^2.0.0",
"hast-util-heading-rank": "^3.0.0",
"hast-util-to-string": "^3.0.0",
"unist-util-visit": "^5.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/rehype-stringify": { "node_modules/rehype-stringify": {
"version": "10.0.0", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/rehype-stringify/-/rehype-stringify-10.0.0.tgz", "resolved": "https://registry.npmjs.org/rehype-stringify/-/rehype-stringify-10.0.0.tgz",

3
package.json
View file

@ -17,7 +17,10 @@
"@astrojs/sitemap": "^3.0.3", "@astrojs/sitemap": "^3.0.3",
"@astrojs/tailwind": "^5.0.4", "@astrojs/tailwind": "^5.0.4",
"astro": "^4.0.7", "astro": "^4.0.7",
"hastscript": "^8.0.0",
"rehype-autolink-headings": "^7.1.0",
"rehype-pretty-code": "^0.12.3", "rehype-pretty-code": "^0.12.3",
"rehype-slug": "^6.0.0",
"remark-gfm": "^4.0.0", "remark-gfm": "^4.0.0",
"remark-rehype": "^11.0.0", "remark-rehype": "^11.0.0",
"sharp": "^0.33.1", "sharp": "^0.33.1",

154
src/layouts/BlogPost.astro
View file

@ -15,6 +15,7 @@ const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
<head> <head>
<BaseHead title={title} description={description} /> <BaseHead title={title} description={description} />
<style is:inline> <style is:inline>
/**** Outer body (not part of the markdown) ****/
main { main {
max-width: 900px; max-width: 900px;
margin: auto; margin: auto;
@ -36,15 +37,49 @@ const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
border-radius: 22px; border-radius: 22px;
filter: drop-shadow(0 4px 6px #000); filter: drop-shadow(0 4px 6px #000);
} }
/**** Headings ****/
.prose h1, .prose h1,
.prose h2, .prose h2,
.prose h3, .prose h3,
.prose h4, .prose h4,
.prose h5, .prose h5,
.prose h6 { .prose h6 {
margin-top: calc(var(--font-size) / 3); margin: calc(var(--font-size) / 3) 0;
font-family: var(--font-title); font-family: var(--font-title);
text-align: left; text-align: left;
padding-left: 20px;
margin-left: -20px;
}
.prose h1 a,
.prose h2 a,
.prose h3 a,
.prose h4 a,
.prose h5 a,
.prose h6 a {
width: 16px;
height: 64px;
position: absolute;
float: left;
margin-top: -2px;
margin-left: -20px;
visibility: hidden;
}
.prose h1:hover a svg.icon-link,
.prose h2:hover a svg.icon-link,
.prose h3:hover a svg.icon-link,
.prose h4:hover a svg.icon-link,
.prose h5:hover a svg.icon-link,
.prose h6:hover a svg.icon-link {
visibility: visible;
}
.prose h1 a svg.icon-link,
.prose h2 a svg.icon-link,
.prose h3 a svg.icon-link,
.prose h4 a svg.icon-link,
.prose h5 a svg.icon-link,
.prose h6 a svg.icon-link {
display: inline-block;
} }
.prose h1 { .prose h1 {
font-size: 40px; font-size: 40px;
@ -61,11 +96,15 @@ const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
.prose h4, .prose h5, .prose h6 { .prose h4, .prose h5, .prose h6 {
font-size: 22px; font-size: 22px;
} }
/**** Paragraphs ****/
.prose p { .prose p {
line-height: 1.5; line-height: 1.5;
font-family: var(--font-sans); font-family: var(--font-sans);
margin: 16px 0; margin: 16px 0;
} }
/**** URLs ****/
.prose a { .prose a {
text-decoration: none; text-decoration: none;
color: var(--accent-color); color: var(--accent-color);
@ -73,54 +112,97 @@ const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
.prose a:hover { .prose a:hover {
text-decoration: underline; text-decoration: underline;
} }
/**** Lists ****/
.prose ul { .prose ul {
padding-left: 30px; padding-left: 30px;
} }
.prose li { .prose ul li {
list-style-type: disc; list-style-type: disc;
} }
.prose ol {
padding-left: 30px;
}
.prose ol li {
list-style-type: decimal;
}
/**** Images ****/
.prose img { .prose img {
display: block; display: block;
margin: 30px auto; margin: 30px auto;
border-radius: 22px; border-radius: 22px;
filter: drop-shadow(0 4px 6px #444); filter: drop-shadow(0 4px 6px #444);
} }
/**** Tables ****/
.prose table {
border-radius: 20px;
margin: calc(var(--font-size) / 3) 0;
}
.prose table th {
text-align: center;
}
.prose table thead {
border-bottom: 2px solid black;
}
.prose table th, .prose table td {
padding: 6px 14px;
margin: 1px;
border: 1px solid black;
}
/**** Block quotes ****/
.prose blockquote {
margin-left: 3px; /* Needs to be equal to border-left width */
padding-left: 15px;
border-left: 3px solid black;
}
/**** Code block ****/
.prose code:not(pre > code) { .prose code:not(pre > code) {
background-color: #f6f6f6; background-color: #f6f6f6;
/*border-radius: 6px;*/ /*border-radius: 6px;*/
border-radius: 6px; border-radius: 6px;
/*padding: 16px;*/ /*padding: 16px;*/
padding: 2px 4px; padding: 2px 4px;
margin: 16px 0; margin: 16px 0;
font-family: var(--font-mono); font-family: var(--font-mono);
/*filter: drop-shadow(0 2px 6px #ddd);*/ /*filter: drop-shadow(0 2px 6px #ddd);*/
} }
.prose pre { .prose pre {
background-color: #f6f6f6; background-color: #f6f6f6;
border-radius: 6px; border-radius: 6px;
padding: 16px; padding: 16px;
margin: 16px 0; margin: 16px 0;
font-family: var(--font-mono); font-family: var(--font-mono);
filter: drop-shadow(0 2px 6px #ddd); filter: drop-shadow(0 2px 6px #ddd);
} }
.prose pre > code[data-line-numbers] { .prose pre > code[data-line-numbers] {
counter-reset: line; counter-reset: line;
} }
.prose pre > code[data-line-numbers] > .line::before { .prose pre > code[data-line-numbers] > .line::before {
counter-increment: line; counter-increment: line;
content: counter(line); content: counter(line);
display: inline-block; display: inline-block;
margin-right: 2rem margin-right: 2rem
width: 1rem; width: 1rem;
text-align: left; text-align: left;
color: #7ca2dfad; color: #7ca2dfad;
} }
.prose pre > code > .line::before { .prose pre > code > .line::before {
content: ""; content: "";
display: inline-block; display: inline-block;
width: 1rem; width: 1rem;
text-align: right; text-align: right;
} }
/**** Other elements ****/
.prose mark {
background-color: white;
font-style: italic;
color: var(--accent-color);
}
</style> </style>
</head> </head>