From cc90ecc6007715ecf8d87ce7e92dd53797247fe6 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 31 Aug 2023 00:37:38 +0200 Subject: [PATCH 1/4] Render code blocks in repo description --- modules/templates/util_render.go | 2 +- templates/repo/home.tmpl | 2 +- web_src/css/base.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index d23103ce1bc56..e502c1040233c 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -111,7 +111,7 @@ var codeMatcher = regexp.MustCompile("`([^`]+)`") // RenderCodeBlock renders "`…`" as highlighted "" block. // Intended for issue and PR titles, these containers should have styles for "" elements func RenderCodeBlock(htmlEscapedTextToRender template.HTML) template.HTML { - htmlWithCodeTags := codeMatcher.ReplaceAllString(string(htmlEscapedTextToRender), "$1") // replace with HTML tags + htmlWithCodeTags := codeMatcher.ReplaceAllString(string(htmlEscapedTextToRender), `$1`) // replace with HTML tags return template.HTML(htmlWithCodeTags) } diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 202c8b8ff3673..983afd73f4997 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -8,7 +8,7 @@
{{$description := .Repository.DescriptionHTML $.Context}} - {{if $description}}{{$description}}{{else if .IsRepositoryAdmin}}{{.locale.Tr "repo.no_desc"}}{{end}} + {{if $description}}{{$description | RenderCodeBlock}}{{else if .IsRepositoryAdmin}}{{.locale.Tr "repo.no_desc"}}{{end}} {{.Repository.Website}}
{{if .RepoSearchEnabled}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 43fcfe46324f7..1437df4fb880e 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -454,7 +454,7 @@ a.label, background: var(--color-hover); } -.issue-title code { +.inline-code-block { padding: 2px 4px; border-radius: var(--border-radius-medium); background-color: var(--color-markup-code-block); From d3d891be37799456e6d0dfc5ca8e5245cbd3554c Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 31 Aug 2023 00:47:41 +0200 Subject: [PATCH 2/4] slight reduction to description font size --- web_src/css/repo.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index bf6f0a7b5e216..04e5eac46c8ce 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -236,8 +236,8 @@ } } -.repository.file.list #repo-desc { - font-size: 1.2em; +#repo-desc { + font-size: 16px; } .repository.file.list .repo-path { From 10ba26bd99bdf0f06cf57d1e3c6726a2994b0a99 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 31 Aug 2023 00:57:45 +0200 Subject: [PATCH 3/4] update comment --- modules/templates/util_render.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index e502c1040233c..ed6eae326a968 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -108,8 +108,7 @@ func RenderCommitBody(ctx context.Context, msg, urlPrefix string, metas map[stri // Match text that is between back ticks. var codeMatcher = regexp.MustCompile("`([^`]+)`") -// RenderCodeBlock renders "`…`" as highlighted "" block. -// Intended for issue and PR titles, these containers should have styles for "" elements +// RenderCodeBlock renders "`…`" as highlighted "" block, intended for issue and PR titles func RenderCodeBlock(htmlEscapedTextToRender template.HTML) template.HTML { htmlWithCodeTags := codeMatcher.ReplaceAllString(string(htmlEscapedTextToRender), `$1`) // replace with HTML tags return template.HTML(htmlWithCodeTags) From a7b5edba8c105af911900b8c99aa7cf1f2dca810 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 31 Aug 2023 04:42:08 +0200 Subject: [PATCH 4/4] use gt-font-16 --- templates/repo/home.tmpl | 2 +- web_src/css/repo.css | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 983afd73f4997..11dc47f555990 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -6,7 +6,7 @@ {{template "repo/code/recently_pushed_new_branches" .}} {{if and (not .HideRepoInfo) (not .IsBlame)}}
-
+
{{$description := .Repository.DescriptionHTML $.Context}} {{if $description}}{{$description | RenderCodeBlock}}{{else if .IsRepositoryAdmin}}{{.locale.Tr "repo.no_desc"}}{{end}} {{.Repository.Website}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 04e5eac46c8ce..94745ff4f51eb 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -236,10 +236,6 @@ } } -#repo-desc { - font-size: 16px; -} - .repository.file.list .repo-path { word-break: break-word; }