Skip to content

Diff file tree tweaks #21446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2022
+12 −10
Merged

Diff file tree tweaks #21446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
195f461
Diff file tree tweaks
silverwind Oct 13, 2022
d02fb8d
Merge branch 'main' into mute-tree
wxiaoguang Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions templates/repo/diff/box.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@
{{else}}
<div>
<div class="diff-detail-box diff-box sticky df sb ac fw">
<a class="diff-toggle-file-tree-button">
{{/* the icon meaning is reversed here, "octicon-sidebar-collapse" means show the file tree */}}
{{svg "octicon-sidebar-collapse" 16 "icon hide"}}
{{svg "octicon-sidebar-expand" 16 "icon"}}
</a>
<div class="diff-detail-stats df ac">
{{svg "octicon-diff" 16 "mr-2"}}{{.locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
<div class="df ac fw">
<a class="diff-toggle-file-tree-button muted df ac">
{{/* the icon meaning is reversed here, "octicon-sidebar-collapse" means show the file tree */}}
{{svg "octicon-sidebar-collapse" 20 "icon hide"}}
{{svg "octicon-sidebar-expand" 20 "icon"}}
</a>
<div class="diff-detail-stats df ac ml-3">
{{svg "octicon-diff" 16 "mr-2"}}{{.locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
</div>
</div>
<div class="diff-detail-actions df ac">
{{if and .PageIsPullFiles $.SignedUserID (not .IsArchived)}}
Expand Down Expand Up @@ -65,7 +67,7 @@
</script>
<div id="diff-file-list"></div>
<div id="diff-container">
<div id="diff-file-tree"></div>
<div id="diff-file-tree" class="hide"></div>
<div id="diff-file-boxes" class="sixteen wide column">
{{range $i, $file := .Diff.Files}}
{{/*notice: the index of Diff.Files should not be used for element ID, because the index will be restarted from 0 when doing load-more for PRs with a lot of files*/}}
Expand Down
4 changes: 2 additions & 2 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3099,11 +3099,11 @@ td.blob-excerpt {

@media @mediaMdAndDown {
#diff-file-tree {
display: none;
display: none !important;
}

.diff-toggle-file-tree-button {
display: none;
display: none !important;
}
}

Expand Down