Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main: Add links to owner home page in explore (go-gitea#28341) Apply min-height in wiki only on preview pane (go-gitea#28687)
zjjhot · Jan 5, 2024 · d8b40bf · d8b40bf
2 parents 5fe699d + dd56933
commit d8b40bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
@@ -7,9 +7,10 @@
  <div class="flex-item-main">
  <div class="flex-item-header">
  <div class="flex-item-title">
- <a class="text primary name" href="{{.Link}}">
- {{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}}
- </a>
+ {{if and (or $.PageIsExplore $.PageIsProfileStarList) .Owner}}
+ <a class="text primary name" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/
+ {{end}}
+ <a class="text primary name" href="{{.Link}}">{{.Name}}</a>
  <span class="label-list">
  {{if .IsArchived}}
  <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>

diff --git a/web_src/css/repo/wiki.css b/web_src/css/repo/wiki.css
@@ -13,7 +13,10 @@
 
 .repository.wiki .markup {
  overflow: visible;
- min-height: 340px;
+}
+
+.repository.wiki .markup[data-tab-panel="markdown-previewer"] {
+ min-height: 340px; /* This height matches the markdown editor's height */
 }
 
 .repository.wiki .wiki-content-parts .markup {