clarify sidebar logic

Author: wxiaoguang

templates/repo/home.tmpl

@@ -18,7 +18,7 @@
 
 		{{$treeNamesLen := len .TreeNames}}
 		{{$isTreePathRoot := eq $treeNamesLen 0}}
-		{{$showSidebar := $isTreePathRoot}}
+		{{$showSidebar := and $isTreePathRoot (not .HideRepoInfo) (not .IsBlame)}}
 		<div class="{{Iif $showSidebar "repo-grid-filelist-sidebar" "repo-grid-filelist-only"}}">
 			<div class="repo-home-filelist">
 				{{template "repo/sub_menu" .}}

templates/repo/home_sidebar_top.tmpl

@@ -1,7 +1,6 @@
 <form class="ignore-dirty tw-flex tw-flex-1 tw-mt-1" action="{{.RepoLink}}/search" method="get">
 	<div class="ui small action input tw-flex-1">
-		<input name="q" size="10" placeholder="{{ctx.Locale.Tr "search.code_kind"}}">
-		{{template "shared/search/button"}}
+		<input name="q" size="10" placeholder="{{ctx.Locale.Tr "search.code_kind"}}"> {{template "shared/search/button"}}
 	</div>
 </form>
 
@@ -10,22 +9,24 @@
 		<div class="flex-item-main">
 			<div class="flex-item-title">{{ctx.Locale.Tr "repo.repo_desc"}}</div>
 			<div class="flex-item-body">
-				{{if and (not .HideRepoInfo) (not .IsBlame)}}
-					<div class="repo-description tw-break-anywhere tw-gap-2 tw-my-2">
+				<div class="tw-flex tw-flex-col tw-gap-1 tw-mt-2">
+					<div class="repo-description tw-break-anywhere tw-gap-2">
 						{{- $description := .Repository.DescriptionHTML ctx -}}
 						{{if $description}}{{$description | RenderCodeBlock}}{{else}}{{ctx.Locale.Tr "repo.repo_no_desc"}}{{end}}
 					</div>
+
 					{{if .Repository.Website}}
 						<a class="flex-text-block" href="{{.Repository.Website}}">
 							{{svg "octicon-link" 16 "tw-text-text"}} <span class="tw-text-primary">{{.Repository.Website}}</span>
 						</a>
 					{{end}}
+
 					<div id="repo-topics" class="flex-text-block tw-flex-wrap tw-gap-1 tw-my-2 tw-text-text">
 						{{/* !!!! it SHOULD and MUST match the code in repo-home.ts */}}
 						{{range .Topics}}<a class="repo-topic ui large label gt-ellipsis" title={{.Name}} href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}}
 					</div>
 					{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
-						<button id="manage_topic" class="btn interact-fg tw-text-12">{{ctx.Locale.Tr "repo.topic.manage_topics"}}</button>
+						<button id="manage_topic" class="btn interact-fg tw-text-12 tw-mb-2">{{ctx.Locale.Tr "repo.topic.manage_topics"}}</button>
 						<div class="ui form tw-hidden tw-my-2" id="topic_edit">
 							<div class="ui fluid multiple search selection dropdown tw-flex-wrap tw-flex-1">
 								<input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if Eval $i "+" 1 "<" (len $.Topics)}},{{end}}{{end}}">
@@ -41,20 +42,19 @@
 							</div>
 						</div>
 					{{end}}
-				{{end}}
-			</div>
-			<div class="flex-item-body">
-				<div class="tw-flex tw-flex-col tw-gap-1 tw-mt-2">
+
 					{{if .ReadmeExist}}
 						<a class="flex-text-block muted" href="{{.TreeLink}}/{{.FileName}}">
 							{{svg "octicon-book"}} {{ctx.Locale.Tr "readme"}}
 						</a>
 					{{end}}
+
 					{{if .DetectedRepoLicenses}}
 						<a class="flex-text-block muted" href="{{.RepoLink}}/src/{{.Repository.DefaultBranch}}/{{PathEscapeSegments .LicenseFileName}}" title="{{StringUtils.Join .DetectedRepoLicenses ", "}}">
 							{{svg "octicon-law"}} {{if eq (len .DetectedRepoLicenses) 1}}{{index .DetectedRepoLicenses 0}}{{else}}{{ctx.Locale.Tr "repo.multiple_licenses"}}{{end}}
 						</a>
 					{{end}}
+
 					{{if .CitiationExist}}
 						{{template "repo/cite/cite_modal" .}}
 						<a class="flex-text-block muted" id="cite-repo-button">