diff options
| author | Alexander Scheel <alexander.m.scheel@gmail.com> | 2020-03-08 15:17:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 21:17:03 +0200 |
| commit | b8551f8532ef7b98cdd8522440b3ff20f39b49f5 (patch) | |
| tree | e7ab261599ad4d6dbee947618d57ee69fc84da15 /vendor | |
| parent | 33c5e5e7fa8ace0f8921b600736f126d752aa0ef (diff) | |
| download | gitea-b8551f8532ef7b98cdd8522440b3ff20f39b49f5.tar.gz gitea-b8551f8532ef7b98cdd8522440b3ff20f39b49f5.zip | |
Fix task-list checkbox styling (#10668)
* Fix task-list checkbox styling
The pandoc renderer will append the class "task-list" to the ul element
wrapping a li with one or more check-boxes. This allows us to select for
them, removing their list-style-type property. However, goldmark and the
gfm spec doesn't specify the "task-list" class name, so we can't use
that to fix the issue there.
Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
* Update to goldmark v1.1.25
This version adds the missing space after a checkbox.
Resolves: #9656
Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/yuin/goldmark/extension/tasklist.go | 4 | ||||
| -rw-r--r-- | vendor/github.com/yuin/goldmark/parser/list.go | 29 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 18 insertions, 17 deletions
diff --git a/vendor/github.com/yuin/goldmark/extension/tasklist.go b/vendor/github.com/yuin/goldmark/extension/tasklist.go index 825f8d5228..1f3e52c204 100644 --- a/vendor/github.com/yuin/goldmark/extension/tasklist.go +++ b/vendor/github.com/yuin/goldmark/extension/tasklist.go @@ -92,9 +92,9 @@ func (r *TaskCheckBoxHTMLRenderer) renderTaskCheckBox(w util.BufWriter, source [ w.WriteString(`<input disabled="" type="checkbox"`) } if r.XHTML { - w.WriteString(" />") + w.WriteString(" /> ") } else { - w.WriteString(">") + w.WriteString("> ") } return gast.WalkContinue, nil } diff --git a/vendor/github.com/yuin/goldmark/parser/list.go b/vendor/github.com/yuin/goldmark/parser/list.go index b1d53bd68e..df1607ea0f 100644 --- a/vendor/github.com/yuin/goldmark/parser/list.go +++ b/vendor/github.com/yuin/goldmark/parser/list.go @@ -166,20 +166,6 @@ func (b *listParser) Continue(node ast.Node, reader text.Reader, pc Context) Sta } return Continue | HasChildren } - // Thematic Breaks take precedence over lists - if isThematicBreak(line, reader.LineOffset()) { - isHeading := false - last := pc.LastOpenedBlock().Node - if ast.IsParagraph(last) { - c, ok := matchesSetextHeadingBar(line) - if ok && c == '-' { - isHeading = true - } - } - if !isHeading { - return Close - } - } // "offset" means a width that bar indicates. // - aaaaaaaa @@ -200,6 +186,21 @@ func (b *listParser) Continue(node ast.Node, reader text.Reader, pc Context) Sta if !list.CanContinue(marker, typ == orderedList) { return Close } + // Thematic Breaks take precedence over lists + if isThematicBreak(line[match[3]-1:], 0) { + isHeading := false + last := pc.LastOpenedBlock().Node + if ast.IsParagraph(last) { + c, ok := matchesSetextHeadingBar(line) + if ok && c == '-' { + isHeading = true + } + } + if !isHeading { + return Close + } + } + return Continue | HasChildren } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 28bf533ec6..61cc1657c7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -452,7 +452,7 @@ github.com/willf/bitset github.com/xanzy/ssh-agent # github.com/yohcop/openid-go v0.0.0-20160914080427-2c050d2dae53 github.com/yohcop/openid-go -# github.com/yuin/goldmark v1.1.24 +# github.com/yuin/goldmark v1.1.25 github.com/yuin/goldmark github.com/yuin/goldmark/ast github.com/yuin/goldmark/extension |