diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2021-10-23 21:38:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-23 21:38:12 +0800 |
| commit | 6c49517cbd9d353d2d56d899632f301919818a03 (patch) | |
| tree | aaca5a05c9867c30282e628e08abac3a209985e9 | |
| parent | 2a9aefdabb24442f18d2ab2eac672a03928de9a4 (diff) | |
| download | gitea-6c49517cbd9d353d2d56d899632f301919818a03.tar.gz gitea-6c49517cbd9d353d2d56d899632f301919818a03.zip | |
Fix issue markdown bugs (#17411)
* Bug fix: render Markdown http://AppURL/org/repo/issues/4?a=1&b=2#comment-123 test to HTML correctly, close #17394
* Bug fix: fix the positions of checkboxes in rendered HTML, close #17395
| -rw-r--r-- | modules/markup/html.go | 2 | ||||
| -rw-r--r-- | modules/markup/html_internal_test.go | 4 | ||||
| -rw-r--r-- | web_src/less/markup/content.less | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/modules/markup/html.go b/modules/markup/html.go index d5ae237b5b..746830720d 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -94,7 +94,7 @@ var issueFullPatternOnce sync.Once func getIssueFullPattern() *regexp.Regexp { issueFullPatternOnce.Do(func() { issueFullPattern = regexp.MustCompile(regexp.QuoteMeta(setting.AppURL) + - `\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#]\S+.(\S+)?)?\b`) + `\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#](\S+)?)?\b`) }) return issueFullPattern } diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index dbad350de2..f9ef90744b 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -265,6 +265,10 @@ func TestRender_FullIssueURLs(t *testing.T) { `<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="ref-issue">person/repo#4</a>`) test("http://localhost:3000/gogits/gogs/issues/4", `<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a>`) + test("http://localhost:3000/gogits/gogs/issues/4 test", + `<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a> test`) + test("http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123 test", + `<a href="http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123" class="ref-issue">#4</a> test`) } func TestRegExp_sha1CurrentPattern(t *testing.T) { diff --git a/web_src/less/markup/content.less b/web_src/less/markup/content.less index 8d9858f0df..e86e2d9f99 100644 --- a/web_src/less/markup/content.less +++ b/web_src/less/markup/content.less @@ -158,9 +158,12 @@ .task-list-item { list-style-type: none; + position: relative; input[type="checkbox"] { - margin: 0 6px .25em -1.6em; + position: absolute; + top: .25em; + left: -1.6em; } } |