Skip to content

Commit 471b6d2

Browse files
authored
Fix PR view misalignment caused by long name file (#23321)
Close #23248 The UI after this PR: https://user-images.githubusercontent.com/17645053/223009758-7f0c9f12-d346-4cb2-a605-729fddce732f.mov
1 parent f0b0f22 commit 471b6d2

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
@@ -1670,8 +1670,14 @@
16701670
align-items: center;
16711671

16721672
.file {
1673-
flex: 1;
1674-
word-break: break-all;
1673+
min-width: 0;
1674+
.file-link {
1675+
max-width: fit-content;
1676+
display: -webkit-box;
1677+
-webkit-box-orient: vertical;
1678+
-webkit-line-clamp: 2;
1679+
overflow: hidden;
1680+
}
16751681
}
16761682

16771683
.button {
@@ -3283,6 +3289,15 @@ td.blob-excerpt {
32833289
position: static;
32843290
}
32853291
}
3292+
3293+
.diff-file-header-actions {
3294+
flex-shrink: 0;
3295+
}
3296+
3297+
.diff-file-name {
3298+
flex: auto;
3299+
min-width: 100px;
3300+
}
32863301
}
32873302

32883303
.diff-file-body {

0 commit comments

Comments
 (0)