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

Improve commit list/view on mobile #19712

Merged
merged 10 commits into from
May 16, 2022
Merged

Improve commit list/view on mobile #19712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d6fefd8
Fix commit view
May 14, 2022
7d790cf
Fix commit list
May 14, 2022
724f52b
Commit title full-width
May 14, 2022
42b1ca1
Tidy up commit view
May 15, 2022
c47e6dd
Force author on same row
May 15, 2022
e6cdbf8
Merge branch 'main' into fix-ui-commit-mobile
May 15, 2022
06beba8
Make linter happy
May 15, 2022
d1921e2
Merge branch 'main' into fix-ui-commit-mobile
May 15, 2022
4f23ee3
Merge branch 'main' into fix-ui-commit-mobile
lunny May 16, 2022
3a4539b
Merge branch 'main' into fix-ui-commit-mobile
6543 May 16, 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
25 changes: 12 additions & 13 deletions templates/repo/commit_page.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
{{$class = (printf "%s%s" $class " isWarning")}}
{{end}}
{{end}}
<div class="ui top attached header clearing segment pr {{$class}}">
<div class="df mb-4">
<div class="ui top attached header clearing segment pr commit-header {{$class}}">
<div class="df mb-4 fw">
<h3 class="mb-0 f1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses "root" $}}</h3>
{{if not $.PageIsWiki}}
<div class="ui">
Expand Down Expand Up @@ -143,8 +143,8 @@
<span class="text grey mr-3">{{svg "octicon-tag" 16 "mr-2"}}{{.TagName}}</span>
{{end}}
</div>
<div class="ui attached segment df ac sb py-2 commit-header-row {{$class}}">
<div class="df ac">
<div class="ui attached segment df ac sb py-2 commit-header-row fw {{$class}}">
<div class="df ac author">
{{if .Author}}
{{avatar .Author 28 "mr-3"}}
{{if .Author.FullName}}
Expand All @@ -171,9 +171,7 @@
<div class="ui horizontal list df ac">
{{if .Parents}}
<div class="item">
{{.i18n.Tr "repo.diff.parent"}}
</div>
<div class="item">
<span>{{.i18n.Tr "repo.diff.parent"}}</span>
{{range .Parents}}
{{if $.PageIsWiki}}
<a class="ui blue sha label" href="{{$.RepoLink}}/wiki/commit/{{PathEscape .}}">{{ShortSha .}}</a>
Expand All @@ -183,13 +181,14 @@
{{end}}
</div>
{{end}}
<div class="mobile-only"></div>
<div class="item">{{.i18n.Tr "repo.diff.commit"}}</div>
<div class="item"><span class="ui blue sha label">{{ShortSha .CommitID}}</span></div>
<div class="item">
<span>{{.i18n.Tr "repo.diff.commit"}}</span>
<span class="ui blue sha label">{{ShortSha .CommitID}}</span>
</div>
</div>
</div>
{{if .Commit.Signature}}
<div class="ui bottom attached message tl df ac sb commit-header-row {{$class}}">
<div class="ui bottom attached message tl df ac sb commit-header-row fw {{$class}}">
<div class="df ac">
{{if .Verification.Verified}}
{{if ne .Verification.SigningUser.ID 0}}
Expand All @@ -204,8 +203,8 @@
{{avatar .Verification.SigningUser 28}}
<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.GetDisplayName}}</strong></a>
{{else}}
<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span>
<span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16 "mr-3"}}</span>
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
{{avatarByEmail .Verification.SigningEmail "" 28}}
<strong>{{.Verification.SigningUser.GetDisplayName}}</strong>
{{end}}
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/commits_list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="ui attached table segment">
<table class="ui very basic striped fixed table single line" id="commits-table">
<div class="ui attached table segment commit-table">
<table class="ui very basic striped table unstackable fixed" id="commits-table">
<thead>
<tr>
<th class="four wide">{{.i18n.Tr "repo.commits.author"}}</th>
Expand Down
79 changes: 79 additions & 0 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3328,4 +3328,83 @@ td.blob-excerpt {
}
}
}
.commit-header-row {
.ui.horizontal.list {
width: 100%;
overflow-x: scroll;
margin-top: 2px;

.item {
align-items: center;
display: flex;
}
}

.author {
padding: 3px 0;
}
}

.commit-header h3 {
flex-basis: auto !important;
margin-bottom: .5rem !important;
}

.commits-table {
flex-direction: column;

.commits-table-left {
align-items: initial !important;
margin-bottom: 6px;
}

.commits-table-right form {
display: flex;
flex-wrap: wrap;

> div:nth-child(1) {
order: 1;
}

> div:nth-child(2) {
order: 3;
margin-left: .5rem;
margin-top: .5rem;
}

> button:nth-child(3) {
order: 2;
margin-left: .25rem;
}
}
}

.commit-table {
overflow-x: scroll;

td.sha,
th.sha {
display: none !important;
}

.commit-list {
span.message-wrapper {
max-width: none;
}

tr td:last-child {
display: block;
width: max-content;
}

td.author {
display: block;
width: calc(100% + .5rem);
}

.copy-commit-sha {
display: none !important;
}
}
}
}