Skip to content
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

Add wrapper to author to avoid long name ui problem (#23030) #23098

Merged
merged 2 commits into from
Feb 24, 2023
Merged

Add wrapper to author to avoid long name ui problem (#23030) #23098

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58544db
Add wrapper to author to avoid long name ui problem (#23030)
HesterG Feb 23, 2023
b84a757
Merge branch 'release/v1.19' into backport-23030-v1.19
lunny Feb 24, 2023
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
6 changes: 3 additions & 3 deletions templates/repo/view_list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
{{if .LatestCommitUser}}
{{avatar $.Context .LatestCommitUser 24}}
{{if .LatestCommitUser.FullName}}
<a class="muted" href="{{.LatestCommitUser.HomeLink}}"><strong>{{.LatestCommitUser.FullName}}</strong></a>
<a class="muted author-wrapper" title="{{.LatestCommitUser.FullName}}" href="{{.LatestCommitUser.HomeLink}}"><strong>{{.LatestCommitUser.FullName}}</strong></a>
{{else}}
<a class="muted" href="{{.LatestCommitUser.HomeLink}}"><strong>{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}</strong></a>
<a class="muted author-wrapper" title="{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}" href="{{.LatestCommitUser.HomeLink}}"><strong>{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}</strong></a>
{{end}}
{{else}}
{{if .LatestCommit.Author}}
{{avatarByEmail $.Context .LatestCommit.Author.Email .LatestCommit.Author.Name 24}}
<strong>{{.LatestCommit.Author.Name}}</strong>
<span class="author-wrapper" title="{{.LatestCommit.Author.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></span>
{{end}}
{{end}}
<a rel="nofollow" class="ui sha label {{if .LatestCommit.Signature}} isSigned {{if .LatestCommitVerification.Verified}} isVerified{{if eq .LatestCommitVerification.TrustStatus "trusted"}}{{else if eq .LatestCommitVerification.TrustStatus "untrusted"}}Untrusted{{else}}Unmatched{{end}}{{else if .LatestCommitVerification.Warning}} isWarning{{end}}{{end}}" href="{{.RepoLink}}/commit/{{PathEscape .LatestCommit.ID.String}}">
Expand Down
19 changes: 15 additions & 4 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@
}

#repo-files-table {
table-layout: fixed;

thead {
th {
padding-top: 8px;
Expand Down Expand Up @@ -2885,14 +2887,19 @@ tbody.commit-list {
vertical-align: baseline;
}

.message-wrapper {
.message-wrapper,
.author-wrapper {
overflow: hidden;
text-overflow: ellipsis;
max-width: calc(100% - 50px);
display: inline-block;
vertical-align: middle;
}

.author-wrapper {
max-width: 180px;
}

// in the commit list, messages can wrap so we can use inline
.commit-list .message-wrapper {
display: inline;
Expand All @@ -2912,6 +2919,10 @@ tbody.commit-list {
display: block;
max-width: calc(100vw - 70px);
}

.author-wrapper {
max-width: 80px;
}
}

@media @mediaMd {
Expand All @@ -2920,7 +2931,7 @@ tbody.commit-list {
}

th .message-wrapper {
max-width: 280px;
max-width: 120px;
}
}

Expand All @@ -2930,7 +2941,7 @@ tbody.commit-list {
}

th .message-wrapper {
max-width: 490px;
max-width: 350px;
}
}

Expand All @@ -2940,7 +2951,7 @@ tbody.commit-list {
}

th .message-wrapper {
max-width: 680px;
max-width: 525px;
}
}

Expand Down