From 47dafcc6bdfcfeaf8aa23f46c3348fd34d5a013b Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 1 Jul 2023 08:12:12 +0200 Subject: [PATCH 1/7] WIP --- templates/repo/commits_list.tmpl | 2 +- web_src/css/repo.css | 4 ---- web_src/js/components/RepoActionView.vue | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 0073ee1562175..6768bcb5137f0 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -1,5 +1,5 @@
- +
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index e20355dbc3bd7..da09b86d9af6f 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -3223,10 +3223,6 @@ tbody.commit-list { .commit-table .commit-list span.message-wrapper { max-width: none; } - .commit-table .commit-list tr td:last-child { - display: block; - width: max-content; - } .commit-table .commit-list td.author { display: block; width: calc(100% + 0.5rem); diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 7c65d5a131c2f..039f58a792305 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -729,6 +729,7 @@ export function initRepositoryActionView() { background-color: var(--color-console-bg); max-height: 100%; border-radius: 0 0 var(--border-radius) var(--border-radius); + z-index: 0; } .job-step-container .job-step-summary { From 456706915fcc58dbca986a19969765086e494d42 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 2 Jul 2023 20:55:29 +0200 Subject: [PATCH 2/7] fixes --- templates/repo/branch/list.tmpl | 4 +- templates/repo/commits_table.tmpl | 2 +- .../issue/labels/labels_selector_field.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 12 +++--- .../repo/issue/view_content/sidebar.tmpl | 6 +-- templates/shared/combomarkdowneditor.tmpl | 2 +- web_src/css/editor/combomarkdowneditor.css | 2 + web_src/css/repo.css | 39 +++++++++++++++++-- web_src/js/components/RepoActionView.vue | 7 +--- 9 files changed, 54 insertions(+), 22 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index b03c8aa566871..3dfa9eff5318b 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -43,7 +43,7 @@ {{svg "octicon-rss"}} {{end}} {{if not $.DisableDownloadSourceArchives}} -
+
{{svg "octicon-download"}}
{{svg "octicon-file-zip"}} ZIP @@ -153,7 +153,7 @@ {{svg "octicon-rss"}} {{end}} {{if and (not .DBBranch.IsDeleted) (not $.DisableDownloadSourceArchives)}} -
+
{{svg "octicon-download"}}
{{svg "octicon-file-zip"}} ZIP diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index eeb50a219ce3f..421779bd87e97 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -8,7 +8,7 @@ {{.locale.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch}} {{if .RefName}}({{.RefName}}){{end}} {{end}}
-
+
{{if .PageIsCommits}}
diff --git a/templates/repo/issue/labels/labels_selector_field.tmpl b/templates/repo/issue/labels/labels_selector_field.tmpl index 6e9f843d430a7..c509cf37c64de 100644 --- a/templates/repo/issue/labels/labels_selector_field.tmpl +++ b/templates/repo/issue/labels/labels_selector_field.tmpl @@ -1,5 +1,5 @@
- + {{.locale.Tr "repo.issues.new.labels"}} {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16 "gt-ml-2"}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index c565be336f6bc..c5da5b08822da 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -59,10 +59,10 @@
- + {{.locale.Tr "repo.issues.new.milestone"}} {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear"}} + {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}}
@@ -86,10 +86,10 @@
- + {{.locale.Tr "repo.issues.new.projects"}} {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear"}} + {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}}
@@ -144,10 +144,10 @@
- + {{.locale.Tr "repo.issues.new.assignees"}} {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear"}} + {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index c4cfa4731ed8f..c3a405d8557db 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -127,7 +127,7 @@
- + {{.locale.Tr "repo.issues.new.milestone"}} {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16 "gt-ml-2"}} @@ -153,7 +153,7 @@
- + {{.locale.Tr "repo.issues.new.projects"}} {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16 "gt-ml-2"}} @@ -207,7 +207,7 @@
- + {{.locale.Tr "repo.issues.new.assignees"}} {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16 "gt-ml-2"}} diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index 26a51b369c75b..4c1742d21f1a1 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -19,7 +19,7 @@ Template Attributes:
{{end}}
- +
{{svg "octicon-heading"}} {{svg "octicon-bold"}} diff --git a/web_src/css/editor/combomarkdowneditor.css b/web_src/css/editor/combomarkdowneditor.css index cfdf074f8edf0..63f4ebf89b6e7 100644 --- a/web_src/css/editor/combomarkdowneditor.css +++ b/web_src/css/editor/combomarkdowneditor.css @@ -7,6 +7,8 @@ display: flex; align-items: center; padding-bottom: 10px; + gap: .5rem; + flex-wrap: wrap; } .combo-markdown-editor .markdown-toolbar-group { diff --git a/web_src/css/repo.css b/web_src/css/repo.css index da09b86d9af6f..20afd9c1a7af9 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -655,9 +655,19 @@ .repository.view.issue .issue-title { flex-direction: column; } + .repository.view.issue .issue-title-buttons, .repository.view.issue .edit-buttons { + width: 100%; + justify-content: space-between; + } .repository.view.issue .edit-buttons { margin-top: .5rem; } + .repository.new.issue .comment.form .comment .avatar, .repository.pull .issue-comment .comment .avatar { + display: none; + } + .repository.new.issue .comment.form .content, .repository.pull .comment.form .content { + margin-left: 0; + } } .repository.view.issue .issue-title { @@ -1197,7 +1207,14 @@ text-align: left; } -.repository.compare.pull .choose.branch .svg { +.repository .choose.branch { + display: flex; + align-items: center; + gap: 8px; + flex-wrap: wrap; +} + +.repository .choose.branch .svg { margin-right: 10px; } @@ -1284,6 +1301,11 @@ left: 0; } +.repository.branches .branch-download { + padding: .5rem; + vertical-align: bottom; +} + .repository.commits .header .search input { font-weight: var(--font-weight-normal); padding: 5px 10px; @@ -2036,12 +2058,15 @@ .repository .ui.segment.sub-menu .list { width: 100%; display: flex; - align-items: center; + align-items: stretch; } .repository .ui.segment.sub-menu .list .item { width: 100%; color: var(--color-text); + display: flex; + align-items: center; + justify-content: center; } .repository .ui.segment.sub-menu .list .item:first-of-type { @@ -3128,6 +3153,11 @@ tbody.commit-list { text-wrap: balance; } +.commits-table .commits-table-right form { + display: flex; + align-items: center; +} + @media (max-width: 767.98px) { .repository.file.list #repo-files-table .entry, .repository.file.list #repo-files-table .commit-list { @@ -3198,7 +3228,7 @@ tbody.commit-list { margin-bottom: 6px; } .commits-table .commits-table-right form { - display: flex; + justify-content: center; flex-wrap: wrap; } .commits-table .commits-table-right form > div:nth-child(1) { @@ -3223,6 +3253,9 @@ tbody.commit-list { .commit-table .commit-list span.message-wrapper { max-width: none; } + .commit-table .commit-list tr td:first-child, .commit-table .commit-list tr td:last-child { + white-space: nowrap; + } .commit-table .commit-list td.author { display: block; width: calc(100% + 0.5rem); diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 039f58a792305..62933a9d85c98 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -477,6 +477,8 @@ export function initRepositoryActionView() {
{{.locale.Tr "repo.commits.author"}}