From c986718965ae161b153002dbff9f5b39d5227371 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 9 Dec 2024 00:16:32 +0800 Subject: [PATCH] Fix repo home row-right grow (#32763) Fix #32753 --- templates/repo/home.tmpl | 4 ++-- templates/repo/home_sidebar_top.tmpl | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 343425134b..46d0398c21 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -102,7 +102,8 @@ {{end}} -
+ {{/* by default, the row-right flex grows, but on non-root tree path, it should not because the row-left might contain a long path */}} +
{{if $isTreePathRoot}}
@@ -122,7 +123,6 @@ {{template "repo/clone_script" .}}{{/* the script will update `.js-clone-url` and related elements */}}
- {{template "repo/cite/cite_modal" .}} {{end}} {{if and (not $isTreePathRoot) (not .IsViewFile) (not .IsBlame)}}{{/* IsViewDirectory (not home), TODO: split the templates, avoid using "if" tricks */}} diff --git a/templates/repo/home_sidebar_top.tmpl b/templates/repo/home_sidebar_top.tmpl index d36c5b0433..4b0ebcd390 100644 --- a/templates/repo/home_sidebar_top.tmpl +++ b/templates/repo/home_sidebar_top.tmpl @@ -43,22 +43,23 @@ {{end}} {{if .ReadmeExist}}
- - {{svg "octicon-book"}}{{ctx.Locale.Tr "readme"}} + + {{svg "octicon-book"}} {{ctx.Locale.Tr "readme"}}
{{end}} {{if .DetectedRepoLicenses}}
- - {{svg "octicon-law"}}{{if eq (len .DetectedRepoLicenses) 1}}{{index .DetectedRepoLicenses 0}}{{else}}{{ctx.Locale.Tr "repo.multiple_licenses"}}{{end}} + + {{svg "octicon-law"}} {{if eq (len .DetectedRepoLicenses) 1}}{{index .DetectedRepoLicenses 0}}{{else}}{{ctx.Locale.Tr "repo.multiple_licenses"}}{{end}}
{{end}} {{if .CitiationExist}}
- - {{svg "octicon-cross-reference"}}{{ctx.Locale.Tr "repo.cite_this_repo"}} + {{template "repo/cite/cite_modal" .}} + + {{svg "octicon-cross-reference"}} {{ctx.Locale.Tr "repo.cite_this_repo"}}
{{end}}