Skip to content

Commit d8b40bf

Browse files
committed
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)
2 parents 5fe699d + dd56933 commit d8b40bf

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

templates/explore/repo_list.tmpl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
<div class="flex-item-main">
88
<div class="flex-item-header">
99
<div class="flex-item-title">
10-
<a class="text primary name" href="{{.Link}}">
11-
{{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}}
12-
</a>
10+
{{if and (or $.PageIsExplore $.PageIsProfileStarList) .Owner}}
11+
<a class="text primary name" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/
12+
{{end}}
13+
<a class="text primary name" href="{{.Link}}">{{.Name}}</a>
1314
<span class="label-list">
1415
{{if .IsArchived}}
1516
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>

web_src/css/repo/wiki.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313

1414
.repository.wiki .markup {
1515
overflow: visible;
16-
min-height: 340px;
16+
}
17+
18+
.repository.wiki .markup[data-tab-panel="markdown-previewer"] {
19+
min-height: 340px; /* This height matches the markdown editor's height */
1720
}
1821

1922
.repository.wiki .wiki-content-parts .markup {

0 commit comments

Comments
 (0)