From d6fefd821c49eaff8bd6912b7c09941f9a542c89 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sat, 14 May 2022 03:45:16 +0200 Subject: [PATCH 1/6] Fix commit view --- templates/repo/commit_page.tmpl | 23 +++++++++++------------ web_src/less/_repository.less | 27 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index f43050ad0e812..d2bb91d436102 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -18,7 +18,7 @@ {{end}} {{end}}
-
+

{{RenderCommitMessage $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses "root" $}}

{{if not $.PageIsWiki}}
@@ -143,8 +143,8 @@ {{svg "octicon-tag" 16 "mr-2"}}{{.TagName}} {{end}}
-
-
+
+
{{if .Author}} {{avatar .Author 28 "mr-3"}} {{if .Author.FullName}} @@ -171,9 +171,7 @@
{{if .Parents}}
- {{.i18n.Tr "repo.diff.parent"}} -
-
+ {{.i18n.Tr "repo.diff.parent"}} {{range .Parents}} {{if $.PageIsWiki}} {{ShortSha .}} @@ -183,13 +181,14 @@ {{end}}
{{end}} -
-
{{.i18n.Tr "repo.diff.commit"}}
-
{{ShortSha .CommitID}}
+
+ {{.i18n.Tr "repo.diff.commit"}} + {{ShortSha .CommitID}} +
{{if .Commit.Signature}} -
+
{{if .Verification.Verified}} {{if ne .Verification.SigningUser.ID 0}} @@ -204,8 +203,8 @@ {{avatar .Verification.SigningUser 28}} {{.Verification.SigningUser.GetDisplayName}} {{else}} - {{svg "gitea-lock-cog"}} - {{.i18n.Tr "repo.commits.signed_by"}}: + {{svg "gitea-lock-cog" 16 "mr-3"}} + {{.i18n.Tr "repo.commits.signed_by"}}: {{avatarByEmail .Verification.SigningEmail "" 28}} {{.Verification.SigningUser.GetDisplayName}} {{end}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 13f9384ba0635..22acd01701887 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3329,3 +3329,30 @@ td.blob-excerpt { } } } + +@media @mediaSm { + .commit-header-row { + .ui.horizontal .item { + text-align: center; + display: flex; + flex-direction: column; + + > a:not(:first-of-type) { + margin-top: 2px; + } + + &:last-child { + margin-left: auto; + } + } + + .author { + margin: auto; + padding: 3px 0; + } + + .ui.horizontal.list { + width: 100%; + } + } +} From 7d790cfb3efe179e2b4da1cf1bf71894c29d18cc Mon Sep 17 00:00:00 2001 From: Gusted Date: Sat, 14 May 2022 04:41:20 +0200 Subject: [PATCH 2/6] Fix commit list --- templates/repo/commits_list.tmpl | 4 +-- web_src/less/_repository.less | 56 ++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 86ad8352021a0..65baee6b63478 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -1,5 +1,5 @@ -
- +
+
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 22acd01701887..a3874cb5a6d14 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3328,9 +3328,6 @@ td.blob-excerpt { } } } -} - -@media @mediaSm { .commit-header-row { .ui.horizontal .item { text-align: center; @@ -3355,4 +3352,57 @@ td.blob-excerpt { width: 100%; } } + + .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; + } + + .copy-commit-sha { + display: none !important; + } + } + } } From 724f52b7f12345df4362885ff274d0929094d5f1 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sat, 14 May 2022 05:05:52 +0200 Subject: [PATCH 3/6] Commit title full-width --- templates/repo/commit_page.tmpl | 2 +- web_src/less/_repository.less | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index d2bb91d436102..70cc7d02ea3c0 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -17,7 +17,7 @@ {{$class = (printf "%s%s" $class " isWarning")}} {{end}} {{end}} -
+

{{RenderCommitMessage $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses "root" $}}

{{if not $.PageIsWiki}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index a3874cb5a6d14..2549a4373fd75 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3353,6 +3353,11 @@ td.blob-excerpt { } } + .commit-header h3 { + flex-basis: auto !important; + margin-bottom: .5rem !important; + } + .commits-table { flex-direction: column; From 42b1ca1e83e36c49b66fa186ed1af44bdde36935 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 15 May 2022 13:34:11 +0200 Subject: [PATCH 4/6] Tidy up commit view --- web_src/less/_repository.less | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 2549a4373fd75..9265e6d4000b5 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3329,28 +3329,20 @@ td.blob-excerpt { } } .commit-header-row { - .ui.horizontal .item { - text-align: center; - display: flex; - flex-direction: column; - - > a:not(:first-of-type) { - margin-top: 2px; - } + .ui.horizontal.list { + width: 100%; + overflow-x: scroll; + margin-top: 2px; - &:last-child { - margin-left: auto; + .item { + align-items: center; + display: flex; } } .author { - margin: auto; padding: 3px 0; } - - .ui.horizontal.list { - width: 100%; - } } .commit-header h3 { From c47e6ddfddaf162916926c7c90f4a67be7839fe5 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 15 May 2022 13:53:25 +0200 Subject: [PATCH 5/6] Force author on same row --- web_src/less/_repository.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 9265e6d4000b5..5123f0f115fa8 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3397,6 +3397,11 @@ td.blob-excerpt { width: max-content; } + td.author { + display: block; + width: calc(100% + 0.5rem); + } + .copy-commit-sha { display: none !important; } From 06beba8059bcaf61acc21473e05703afe8bf4cd7 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 15 May 2022 15:08:47 +0200 Subject: [PATCH 6/6] Make linter happy --- web_src/less/_repository.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 5123f0f115fa8..f8a23e071af50 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3399,7 +3399,7 @@ td.blob-excerpt { td.author { display: block; - width: calc(100% + 0.5rem); + width: calc(100% + .5rem); } .copy-commit-sha {
{{.i18n.Tr "repo.commits.author"}}