liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: markdown checkbox rendering with links

Browse Source
This commit is contained in:
NGPixel 2021-12-08 23:56:19 -05:00
parent 29e0852a3e
commit 0d7d95d2ac
No known key found for this signature in database
GPG Key ID: 8FDA2F1757F60D63
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/components/editor/editor-markdown.vue
View File

@ -290,7 +290,7 @@ const md = new MarkdownIt({
}) })
.use(underline) .use(underline)
.use(mdEmoji) .use(mdEmoji)
.use(mdTaskLists, {label: true, labelAfter: true}) .use(mdTaskLists, {label: false, labelAfter: false})
.use(mdExpandTabs) .use(mdExpandTabs)
.use(mdAbbr) .use(mdAbbr)
.use(mdSup) .use(mdSup)
@ -627,7 +627,7 @@ export default {
hint: async (cm, options) => { hint: async (cm, options) => {
const cur = cm.getCursor() const cur = cm.getCursor()
const curLine = cm.getLine(cur.line).substring(0, cur.ch) const curLine = cm.getLine(cur.line).substring(0, cur.ch)
const queryString = curLine.substring(curLine.lastIndexOf('[')+1,curLine.length-2) const queryString = curLine.substring(curLine.lastIndexOf('[') + 1, curLine.length - 2)
const token = cm.getTokenAt(cur) const token = cm.getTokenAt(cur)
try { try {
const respRaw = await this.$apollo.query({ const respRaw = await this.$apollo.query({

30
client/themes/default/scss/app.scss
View File

@ -77,7 +77,7 @@
& + h2, & + h3, & + h4, & + h5, & + h6 { & + h2, & + h3, & + h4, & + h5, & + h6 {
margin-top: 8px; margin-top: 8px;
} }
& + hr.footnotes-sep { & + hr.footnotes-sep {
display: none; display: none;
} }
@ -508,7 +508,7 @@
} }
} }
ul:not(.tabset-tabs) { ul:not(.tabset-tabs):not(.contains-task-list) {
list-style: none; list-style: none;
> li::before { > li::before {
position: absolute; position: absolute;
@ -596,21 +596,25 @@
// TASK LISTS // TASK LISTS
// --------------------------------- // ---------------------------------
.contains-task-list {
padding-left: 0;
}
.task-list-item { .task-list-item {
position: relative; position: relative;
list-style-type: none; list-style-type: none;
&-checkbox[disabled] { &-checkbox[disabled] {
display: none; width: 1.1rem;
height: 1.1rem;
top: 2px;
position: relative;
margin-right: 2px;
& + label { &::after {
padding-left: 1.5rem;
}
& + label::before {
position: absolute; position: absolute;
left: 0; left: 0;
top: 2px; top: 0;
content: ' '; content: ' ';
display: block; display: block;
width: 1.1rem; width: 1.1rem;
@ -629,7 +633,7 @@
} }
} }
&[checked] + label::before { &[checked]::after {
content: '✓'; content: '✓';
} }
} }
@ -817,15 +821,15 @@
outline: none; outline: none;
background-color: mc('grey', '100'); background-color: mc('grey', '100');
} }
> h1, h2, h3, h4, h5, h6 { > h1, h2, h3, h4, h5, h6 {
width: 95%; width: 95%;
display: inline-block; display: inline-block;
&:first-child { &:first-child {
margin-top: 0; margin-top: 0;
} }
&:only-child::after { &:only-child::after {
display: none; display: none;
} }