Skip to content

Commit 7118b0e

Browse files
committed
fix: list styling issue
1 parent 73aa24f commit 7118b0e

File tree

6 files changed

+1139
-196
lines changed

6 files changed

+1139
-196
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
"remark-math": "^6.0.0",
4545
"slugify": "^1.6.6",
4646
"twikoo": "^1.6.40",
47-
"yaml": "^2.6.1"
47+
"yaml": "^2.7.0"
4848
},
4949
"devDependencies": {
5050
"@antfu/eslint-config": "^3.12.1",
51-
"@eslint-react/eslint-plugin": "^1.22.1",
51+
"@eslint-react/eslint-plugin": "^1.23.0",
5252
"@next/eslint-plugin-next": "^15.1.3",
5353
"@tailwindcss/typography": "^0.5.15",
5454
"@types/node": "^22.10.2",

pnpm-lock.yaml

+280-187
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

posts/2024-annual-summary.md

+479
Large diffs are not rendered by default.

posts/2024-columbia-travelogue.md

+367
Large diffs are not rendered by default.

src/components/article/parser/markdownComponents.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,16 @@ function createMarkdownComponents(translation: Translation, autoSlug: boolean =
111111

112112
ul: ({ children }) => (
113113
<div className="my-4 ml-2 rounded-lg border-2 border-dashed border-[var(--sakuraPink)] p-4">
114-
<ul className="list-inside list-disc space-y-2">{children as ReactNode}</ul>
114+
<ul className="list-disc list-inside">{children as ReactNode}</ul>
115115
</div>
116116
),
117117
ol: ({ children }) => (
118118
<div className="my-4 ml-2 rounded-lg border-2 border-dashed border-[var(--skyblue)] p-4">
119-
<ol className="list-inside list-decimal space-y-2">{children as ReactNode}</ol>
119+
<ol className="list-decimal list-inside">{children as ReactNode}</ol>
120120
</div>
121121
),
122122
li: ({ children }) => (
123-
<li className="text-foreground mb-1 leading-relaxed marker:text-[var(--sakuraPink)]">
123+
<li className="text-foreground leading-relaxed marker:text-[var(--sakuraPink)] list-outside pl-4 ml-4">
124124
{children as ReactNode}
125125
</li>
126126
),

src/services/utils/generateHierarchicalSlug.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@ function generateHierarchicalSlug(children: React.ReactNode | string, level: key
2121
}
2222

2323
function slugPrefix(slug: string, level: number) {
24-
return `${slug
25-
.split('-')
26-
.slice(0, level - 1)
27-
.join('.')}.`
24+
const parts = slug.split('-')
25+
if (level === 6) {
26+
return `${parts
27+
.slice(-2)
28+
.map(part => String.fromCharCode(96 + Number.parseInt(part, 10)))
29+
.join('.')} `
30+
}
31+
return `${parts.slice(0, level - 1).join('.')} `
2832
}
2933

3034
export { generateHierarchicalSlug as default, slugPrefix }

0 commit comments

Comments
 (0)