Render code tags in commit messages (#30146)

silverwind · web-flow · commit e40fc75bac65 · 2024-03-28T10:42:31.000Z
Extend #21432 to commit messages. Color is changed because the markup code block bg does not offer enough contrast on varying backgrounds. <img width="568" alt="Screenshot 2024-03-27 at 19 52 55" src="https://github.com/go-gitea/gitea/assets/115237/ddc9307e-f32f-4e97-8b88-91f88ced2a36"> <img width="573" alt="Screenshot 2024-03-27 at 19 53 33" src="https://github.com/go-gitea/gitea/assets/115237/14b30fd2-bf28-46b8-9e82-eb60a28f6bf2"> <img width="422" alt="Screenshot 2024-03-27 at 19 53 01" src="https://github.com/go-gitea/gitea/assets/115237/a12136b5-c02b-460c-9830-f830542987ae"> <img width="397" alt="Screenshot 2024-03-27 at 19 53 27" src="https://github.com/go-gitea/gitea/assets/115237/c9f05d81-c73e-468e-98e9-e5929bc0da3e"> <img width="333" alt="Screenshot 2024-03-27 at 19 53 07" src="https://github.com/go-gitea/gitea/assets/115237/06b5a9f9-f95d-46b6-8c57-df0b02555652"> <img width="279" alt="Screenshot 2024-03-27 at 19 53 21" src="https://github.com/go-gitea/gitea/assets/115237/b06a0afc-ddd8-48ae-b557-a6dc47802e68">
diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
@@ -41,7 +41,7 @@ func RenderCommitMessage(ctx context.Context, msg string, metas map[string]strin
 	if len(msgLines) == 0 {
 		return template.HTML("")
 	}
-	return template.HTML(msgLines[0])
+	return RenderCodeBlock(template.HTML(msgLines[0]))
 }
 
 // RenderCommitMessageLinkSubject renders commit message as a XSS-safe link to
@@ -68,7 +68,7 @@ func RenderCommitMessageLinkSubject(ctx context.Context, msg, urlDefault string,
 		log.Error("RenderCommitMessageSubject: %v", err)
 		return template.HTML("")
 	}
-	return template.HTML(renderedMessage)
+	return RenderCodeBlock(template.HTML(renderedMessage))
 }
 
 // RenderCommitBody extracts the body of a commit message without its title.
diff --git a/web_src/css/base.css b/web_src/css/base.css
@@ -300,8 +300,8 @@ a.label,
 
 .inline-code-block {
   padding: 2px 4px;
-  border-radius: var(--border-radius-medium);
-  background-color: var(--color-markup-code-block);
+  border-radius: .24em;
+  background-color: var(--color-label-bg);
 }
 
 /* fix Fomantic's line-height cutting off "g" on Windows Chrome with Segoe UI */

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func RenderCommitMessage(ctx context.Context, msg string, metas map[string]strin`
`41`	`41`	`if len(msgLines) == 0 {`
`42`	`42`	`return template.HTML("")`
`43`	`43`	`}`
`44`		`- return template.HTML(msgLines[0])`
	`44`	`+ return RenderCodeBlock(template.HTML(msgLines[0]))`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// RenderCommitMessageLinkSubject renders commit message as a XSS-safe link to`
`@@ -68,7 +68,7 @@ func RenderCommitMessageLinkSubject(ctx context.Context, msg, urlDefault string,`
`68`	`68`	`log.Error("RenderCommitMessageSubject: %v", err)`
`69`	`69`	`return template.HTML("")`
`70`	`70`	`}`
`71`		`- return template.HTML(renderedMessage)`
	`71`	`+ return RenderCodeBlock(template.HTML(renderedMessage))`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`// RenderCommitBody extracts the body of a commit message without its title.`
Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,8 @@ a.label,`
`300`	`300`
`301`	`301`	`.inline-code-block {`
`302`	`302`	`padding: 2px 4px;`
`303`		`- border-radius: var(--border-radius-medium);`
`304`		`- background-color: var(--color-markup-code-block);`
	`303`	`+ border-radius: .24em;`
	`304`	`+ background-color: var(--color-label-bg);`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`/* fix Fomantic's line-height cutting off "g" on Windows Chrome with Segoe UI */`