about summary refs log tree commit diff stats
path: root/filters
diff options
context:
space:
mode:
authorJune McEnroe2022-02-13 12:07:49 -0500
committerJune McEnroe2022-02-13 12:10:49 -0500
commit516175469a8c6895496ef909b487992deb45f460 (patch)
treee0e8b4d38f05e870089de8babc0d3aca3bb4d3b0 /filters
parentFix crash trying to print "this commit" on 404s (diff)
parentgit: update to v2.32.0 (diff)
downloadcgit-516175469a8c6895496ef909b487992deb45f460.tar.gz
cgit-516175469a8c6895496ef909b487992deb45f460.zip
Merge up to git v2.32.0
Diffstat (limited to 'filters')
-rwxr-xr-xfilters/commit-links.sh2
-rwxr-xr-xfilters/html-converters/md2html7
2 files changed, 3 insertions, 6 deletions
diff --git a/filters/commit-links.sh b/filters/commit-links.sh index 5881952..796ac30 100755 --- a/filters/commit-links.sh +++ b/filters/commit-links.sh
@@ -19,7 +19,7 @@ regex=''
19 19
20# This expression generates links to commits referenced by their SHA1. 20# This expression generates links to commits referenced by their SHA1.
21regex=$regex' 21regex=$regex'
22s|\b([0-9a-fA-F]{7,40})\b|<a href="./?id=\1">\1</a>|g' 22s|\b([0-9a-fA-F]{7,64})\b|<a href="./?id=\1">\1</a>|g'
23 23
24# This expression generates links to a fictional bugtracker. 24# This expression generates links to a fictional bugtracker.
25regex=$regex' 25regex=$regex'
diff --git a/filters/html-converters/md2html b/filters/html-converters/md2html index dc20f42..59f43a8 100755 --- a/filters/html-converters/md2html +++ b/filters/html-converters/md2html
@@ -86,11 +86,7 @@ div#cgit .markdown-body h1 a.toclink, div#cgit .markdown-body h2 a.toclink, div#
86 margin: 15px 0; 86 margin: 15px 0;
87} 87}
88.markdown-body hr { 88.markdown-body hr {
89 background: transparent url("/dirty-shade.png") repeat-x 0 0; 89 border: 2px solid #ccc;
90 border: 0 none;
91 color: #ccc;
92 height: 4px;
93 padding: 0;
94} 90}
95.markdown-body>h2:first-child, .markdown-body>h1:first-child, .markdown-body>h1:first-child+h2, .markdown-body>h3:first-child, .markdown-body>h4:first-child, .markdown-body>h5:first-child, .markdown-body>h6:first-child { 91.markdown-body>h2:first-child, .markdown-body>h1:first-child, .markdown-body>h1:first-child+h2, .markdown-body>h3:first-child, .markdown-body>h4:first-child, .markdown-body>h5:first-child, .markdown-body>h6:first-child {
96 margin-top: 0; 92 margin-top: 0;
@@ -301,6 +297,7 @@ markdown.markdownFromFile(
301 "markdown.extensions.fenced_code", 297 "markdown.extensions.fenced_code",
302 "markdown.extensions.codehilite", 298 "markdown.extensions.codehilite",
303 "markdown.extensions.tables", 299 "markdown.extensions.tables",
300 "markdown.extensions.sane_lists",
304 TocExtension(anchorlink=True)], 301 TocExtension(anchorlink=True)],
305 extension_configs={ 302 extension_configs={
306 "markdown.extensions.codehilite":{"css_class":"highlight"}}) 303 "markdown.extensions.codehilite":{"css_class":"highlight"}})