Skip to content

Commit 6be6c19

Browse files
GiteaBotHesterGlunny
authored
Fix PR view misalignment caused by long name file (#23321) (#23335)
Backport #23321 Close #23248 The UI after this PR: https://user-images.githubusercontent.com/17645053/223009758-7f0c9f12-d346-4cb2-a605-729fddce732f.mov Co-authored-by: Hester Gong <[email protected]> Co-authored-by: Lunny Xiao <[email protected]>
1 parent 61f91bd commit 6be6c19

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

templates/repo/diff/box.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
{{$isExpandable := or (gt $file.Addition 0) (gt $file.Deletion 0) $file.IsBin}}
8080
<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}} gt-mt-3" id="diff-{{$file.NameHash}}" data-old-filename="{{$file.OldName}}" data-new-filename="{{$file.Name}}" {{if or ($file.ShouldBeHidden) (not $isExpandable)}}data-folded="true"{{end}}>
8181
<h4 class="diff-file-header sticky-2nd-row ui top attached normal header gt-df gt-ac gt-sb">
82-
<div class="gt-df gt-ac">
82+
<div class="diff-file-name gt-df gt-ac gt-mr-3">
8383
<a role="button" class="fold-file muted gt-mr-2" {{if not $isExpandable}}style="visibility: hidden"{{end}}>
8484
{{if $file.ShouldBeHidden}}
8585
{{svg "octicon-chevron-right" 18}}
@@ -96,7 +96,7 @@
9696
{{template "repo/diff/stats" dict "file" . "root" $}}
9797
{{end}}
9898
</div>
99-
<span class="file gt-mono"><a class="muted" href="#diff-{{$file.NameHash}}">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}</a>{{if .IsLFSFile}} ({{$.locale.Tr "repo.stored_lfs"}}){{end}}</span>
99+
<span class="file gt-mono"><a class="muted file-link" title="{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}" href="#diff-{{$file.NameHash}}">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}</a>{{if .IsLFSFile}} ({{$.locale.Tr "repo.stored_lfs"}}){{end}}</span>
100100
{{if $file.IsGenerated}}
101101
<span class="ui label gt-ml-3">{{$.locale.Tr "repo.diff.generated"}}</span>
102102
{{end}}

web_src/less/_repository.less

+17-2
Original file line numberDiff line numberDiff line change
@@ -1663,8 +1663,14 @@
16631663
align-items: center;
16641664

16651665
.file {
1666-
flex: 1;
1667-
word-break: break-all;
1666+
min-width: 0;
1667+
.file-link {
1668+
max-width: fit-content;
1669+
display: -webkit-box;
1670+
-webkit-box-orient: vertical;
1671+
-webkit-line-clamp: 2;
1672+
overflow: hidden;
1673+
}
16681674
}
16691675

16701676
.button {
@@ -3276,6 +3282,15 @@ td.blob-excerpt {
32763282
position: static;
32773283
}
32783284
}
3285+
3286+
.diff-file-header-actions {
3287+
flex-shrink: 0;
3288+
}
3289+
3290+
.diff-file-name {
3291+
flex: auto;
3292+
min-width: 100px;
3293+
}
32793294
}
32803295

32813296
.diff-file-body {

0 commit comments

Comments
 (0)