From 4a722c9a45659e7732258397bbb3dd1039ea1952 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 3 May 2023 23:58:59 +0200 Subject: [PATCH] Make Issue/PR/projects more compact, misc CSS tweaks (#24459) - Remove various horizontal dividers on repo pages that didn't provide visual benefit - Remove label/milestone pills on single issue/pr page - Remove issue-related pill buttons on projects page - Increase contrast of color-secondary on arc-green - Improve notifications icon, make circle bigger - Remove some inline styles - Fix focus in issue/pr title edit and select all text on button click ### Issue and PR before and after Screenshot 2023-05-01 at 11 44 22 Screenshot 2023-05-01 at 11 58 51 ### Projects before and after Screenshot 2023-05-01 at 11 41 02 Screenshot 2023-05-01 at 11 40 03 ### Releases before and after Screenshot 2023-05-01 at 11 41 12 Screenshot 2023-05-01 at 11 40 10 ### Misc Screenshot 2023-05-01 at 10 49 13 Screenshot 2023-05-01 at 18 57 08 Issue title edit and wrap: Screenshot 2023-05-01 at 12 34 40 Screenshot 2023-05-01 at 12 06 24 --------- Co-authored-by: wxiaoguang --- templates/org/member/members.tmpl | 2 +- templates/projects/list.tmpl | 2 +- templates/repo/actions/openclose.tmpl | 2 +- templates/repo/branch_dropdown.tmpl | 9 +- templates/repo/commits.tmpl | 2 +- templates/repo/home.tmpl | 2 +- templates/repo/issue/labels.tmpl | 3 +- templates/repo/issue/list.tmpl | 3 - templates/repo/issue/milestones.tmpl | 5 +- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/new.tmpl | 4 - templates/repo/issue/openclose.tmpl | 2 +- templates/repo/issue/view.tmpl | 25 +-- templates/repo/issue/view_content.tmpl | 9 - templates/repo/issue/view_title.tmpl | 194 ++++++++++-------- templates/repo/projects/list.tmpl | 62 +++--- templates/repo/pulls/commits.tmpl | 11 +- templates/repo/pulls/files.tmpl | 14 +- templates/repo/release/list.tmpl | 10 +- templates/repo/settings/options.tmpl | 6 +- templates/repo/sub_menu_release_tag.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- .../notification_subscriptions.tmpl | 2 +- tests/integration/issue_test.go | 2 +- web_src/css/base.css | 10 +- web_src/css/repository.css | 110 +++++----- web_src/css/repository/issue-list.css | 1 + web_src/css/repository/list-header.css | 4 +- web_src/css/repository/release-tag.css | 27 +-- web_src/css/themes/theme-arc-green.css | 52 ++--- .../js/components/RepoBranchTagSelector.vue | 2 +- web_src/js/features/repo-issue.js | 4 +- web_src/js/features/repo-legacy.js | 6 +- 34 files changed, 265 insertions(+), 330 deletions(-) diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index d6ab265ea8..3d5b3beebd 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -7,7 +7,7 @@
{{range .Members}}
-
+
{{avatar $.Context . 48}}
{{.Name}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 1ef0b0be97..e9e86e5d5d 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -10,7 +10,7 @@ {{end}} {{template "base/alert" .}} -
+
{{svg "octicon-project-symlink" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/repo/actions/openclose.tmpl b/templates/repo/actions/openclose.tmpl index 74630187cd..6874115a19 100644 --- a/templates/repo/actions/openclose.tmpl +++ b/templates/repo/actions/openclose.tmpl @@ -1,4 +1,4 @@ -
+
{{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "actions.runs.open_tab" $.NumOpenActionRuns}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 0f79474d10..984899552d 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -1,3 +1,8 @@ +{{/* Attributes: +* root +* ContainerClasses +* (TODO: search "branch_dropdown" in the template direcotry) +*/}} {{$defaultBranch := $.root.BranchName}} {{if and .root.IsViewTag (not .noTag)}} {{$defaultBranch = .root.TagName}} @@ -62,10 +67,10 @@ window.config.pageData.branchDropdownDataList.push(data); -
+
{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
- - {{end}} -

- {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} - #{{.Issue.Index}} -
+

+ {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}} + +

+
+ {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} + + {{end}} + {{if not .Issue.IsPull}} + {{.locale.Tr "repo.issues.new"}} + {{end}} +
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
- - + +
{{end}}
- {{if .HasMerged}} -
{{svg "octicon-git-merge" 16}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}
- {{else if .Issue.IsClosed}} -
{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}
- {{else if .Issue.IsPull}} - {{if .IsPullWorkInProgress}} -
{{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}
- {{else}} -
{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}
- {{end}} - {{else}} -
{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}
- {{end}} - - {{if .Issue.IsPull}} - {{$headHref := .HeadTarget|Escape}} - {{if .HeadBranchLink}} - {{$headHref = printf "%s" (.HeadBranchLink | Escape) $headHref}} - {{end}} - {{$headHref = printf "%s %s" $headHref (.locale.Tr "copy_branch") (.HeadTarget | Escape) (svg "octicon-copy" 14)}} - {{$baseHref := .BaseTarget|Escape}} - {{if .BaseBranchLink}} - {{$baseHref = printf "%s" (.BaseBranchLink | Escape) $baseHref}} - {{end}} - {{if .Issue.PullRequest.HasMerged}} - {{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.locale}} - {{if .Issue.OriginalAuthor}} - {{.Issue.OriginalAuthor}} - {{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}} +
+ {{if .HasMerged}} +
{{svg "octicon-git-merge" 16 "gt-mr-2"}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}
+ {{else if .Issue.IsClosed}} +
{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}
+ {{else if .Issue.IsPull}} + {{if .IsPullWorkInProgress}} +
{{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}
{{else}} - {{.Issue.PullRequest.Merger.GetDisplayName}} - {{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}} +
{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}
{{end}} {{else}} - {{if .Issue.OriginalAuthor}} - {{.Issue.OriginalAuthor}} {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} +
{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}
+ {{end}} +
+ {{if .Issue.IsPull}} + {{$headHref := .HeadTarget|Escape}} + {{if .HeadBranchLink}} + {{$headHref = printf "%s" (.HeadBranchLink | Escape) $headHref}} + {{end}} + {{$headHref = printf "%s %s" $headHref (.locale.Tr "copy_branch") (.HeadTarget | Escape) (svg "octicon-copy" 14)}} + {{$baseHref := .BaseTarget|Escape}} + {{if .BaseBranchLink}} + {{$baseHref = printf "%s" (.BaseBranchLink | Escape) $baseHref}} + {{end}} + {{if .Issue.PullRequest.HasMerged}} + {{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.locale}} + {{if .Issue.OriginalAuthor}} + {{.Issue.OriginalAuthor}} + {{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}} + {{else}} + {{.Issue.PullRequest.Merger.GetDisplayName}} + {{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}} + {{end}} + {{else}} + {{if .Issue.OriginalAuthor}} + {{.Issue.OriginalAuthor}} {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} + {{else}} + + {{.Issue.Poster.GetDisplayName}} + {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} + + {{end}} + +
+
+ {{.locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}} +
+
+ {{svg "octicon-arrow-right"}} +
+
+ {{.locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+
+
+ {{svg "octicon-filter" 16}} + +
+ +
+
+ + {{end}} {{else}} - - {{.Issue.Poster.GetDisplayName}} - {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} + {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}} + + {{if .Issue.OriginalAuthor}} + {{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.OriginalAuthor|Escape) | Safe}} + {{else if gt .Issue.Poster.ID 0}} + {{$.locale.Tr "repo.issues.opened_by" $createdStr (.Issue.Poster.HomeLink|Escape) (.Issue.Poster.GetDisplayName|Escape) | Safe}} + {{else}} + {{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.Poster.GetDisplayName|Escape) | Safe}} + {{end}} + · + {{$.locale.Tr "repo.issues.num_comments" .Issue.NumComments}} {{end}} - -
-
- {{.locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}} -
-
- {{svg "octicon-arrow-right"}} -
-
- {{.locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
-
- {{svg "octicon-filter" 16}} - -
- -
-
- - {{end}} - {{else}} - {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}} - - {{if .Issue.OriginalAuthor}} - {{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.OriginalAuthor|Escape) | Safe}} - {{else if gt .Issue.Poster.ID 0}} - {{$.locale.Tr "repo.issues.opened_by" $createdStr (.Issue.Poster.HomeLink|Escape) (.Issue.Poster.GetDisplayName|Escape) | Safe}} - {{else}} - {{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.Poster.GetDisplayName|Escape) | Safe}} - {{end}} - · - {{$.locale.Tr "repo.issues.num_comments" .Issue.NumComments}} - - {{end}} -
+
+

diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 5cd94c626d..a5f99cee66 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -2,41 +2,39 @@
{{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} - {{if and .CanWriteProjects (not .Repository.IsArchived)}} -
- {{.locale.Tr "repo.projects.new"}} -
- {{end}} -
-
- {{template "base/alert" .}} -
- - {{svg "octicon-project" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - - - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - -
- -
- -
- - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.issues.filter_sort.oldest"}} - {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} +
+ +
+ +
+ + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} +
+
+ {{if and .CanWriteProjects (not .Repository.IsArchived)}} + {{.locale.Tr "repo.projects.new"}} + {{end}} +
+ {{template "base/alert" .}} +
{{range .Projects}}
  • diff --git a/templates/repo/pulls/commits.tmpl b/templates/repo/pulls/commits.tmpl index bb113da268..bf6e8128d4 100644 --- a/templates/repo/pulls/commits.tmpl +++ b/templates/repo/pulls/commits.tmpl @@ -2,18 +2,9 @@
    {{template "repo/header" .}}
    -
    - {{template "repo/issue/navbar" .}} -
    - {{.locale.Tr "repo.pulls.new"}} -
    -
    -
    {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} -
    - {{template "repo/commits_table" .}} -
    + {{template "repo/commits_table" .}}
    {{template "base/footer" .}} diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl index 1e02dfa397..feec6eae74 100644 --- a/templates/repo/pulls/files.tmpl +++ b/templates/repo/pulls/files.tmpl @@ -5,20 +5,10 @@
    {{template "repo/header" .}} -
    -
    - {{template "repo/issue/navbar" .}} -
    - {{.locale.Tr "repo.pulls.new"}} -
    -
    -
    +
    {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} - {{template "base/alert" .}} -
    - {{template "repo/diff/box" .}} -
    + {{template "repo/diff/box" .}}
    {{template "base/footer" .}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 3d596a49e2..be0976c1af 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -14,13 +14,11 @@
      {{range $idx, $release := .Releases}}
    • -
      - {{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}} +
      + {{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}} {{if .Sha1}} - - {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}} - - {{template "repo/branch_dropdown" dict "root" $ "release" .}} + {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}} + {{template "repo/branch_dropdown" dict "root" $ "release" . "ContainerClasses" "gt-mt-4"}} {{end}}
      diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index af753ba670..688d00bd72 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -91,7 +91,7 @@ {{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}} {{DateTime "full" .Mirror.UpdatedUnix}} -
      + {{.CsrfTokenHtml}} @@ -169,13 +169,13 @@ {{$.locale.Tr "repo.settings.mirror_settings.direction.push"}} {{if .LastUpdateUnix}}{{DateTime "full" .LastUpdateUnix}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}
      {{$.locale.Tr "error"}}
      {{end}} - + {{$.CsrfTokenHtml}}
      -
      + {{$.CsrfTokenHtml}} diff --git a/templates/repo/sub_menu_release_tag.tmpl b/templates/repo/sub_menu_release_tag.tmpl index 2795241556..c700893ee6 100644 --- a/templates/repo/sub_menu_release_tag.tmpl +++ b/templates/repo/sub_menu_release_tag.tmpl @@ -2,7 +2,7 @@ {{$canReadCode := $.Permission.CanRead $.UnitTypeCode}} {{if $canReadReleases}} -

      +

      {{.locale.Tr "repo.release.releases"}} {{if $canReadCode}} {{.locale.Tr "repo.release.tags"}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index da7867a225..8878fe93ca 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -61,7 +61,7 @@

      -
      +
      {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.PrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index f9d8ae1eb0..207b2d7035 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -35,7 +35,7 @@
      -
      +
      {{svg "octicon-milestone" 16 "gt-mr-3"}} {{.locale.PrettyNumber .MilestoneStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 6d3262ad6d..df69a4dad1 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -13,7 +13,7 @@ {{if eq .Status 1}}
      -
      +
      {{.locale.Tr "all"}} diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index eccf3c3795..7ea7fefb64 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -143,7 +143,7 @@ func testNewIssue(t *testing.T, session *TestSession, user, repo, title, content htmlDoc = NewHTMLParser(t, resp.Body) val := htmlDoc.doc.Find("#issue-title").Text() - assert.Equal(t, title, val) + assert.Contains(t, val, title) val = htmlDoc.doc.Find(".comment .render-content p").First().Text() assert.Equal(t, content, val) diff --git a/web_src/css/base.css b/web_src/css/base.css index d854f9badd..591c09377c 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2559,18 +2559,18 @@ a.ui.basic.label:hover { .notification_count { position: absolute; - left: 5px; - top: -8px; + left: 7px; + top: -9px; min-width: 1.5em; text-align: center; background: var(--color-primary); border: 2px solid var(--color-header-bar); color: var(--color-header-bar); - padding: 2px; + padding: 2.75px; border-radius: 1em; - font-size: 10px; + font-size: 11px; font-weight: 700; - line-height: 0.7; + line-height: .67em; } table th[data-sortt-asc]:hover, diff --git a/web_src/css/repository.css b/web_src/css/repository.css index d724dc400a..6709b127db 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -591,87 +591,83 @@ display: inline-block; } -.repository.view.issue .title { - padding-bottom: 0 !important; +.issue-title-header { + width: 100%; + padding-bottom: 4px; + margin-bottom: 1rem; } -.repository.view.issue .title .issue-title { - margin-bottom: 0.5rem; -} - -.repository.view.issue .title .issue-title.edit-active { +.issue-title-meta { display: flex; align-items: center; } -.repository.view.issue .title .issue-title.edit-active h1 { +.repository.view.issue .issue-title-buttons, +.repository.view.issue .edit-buttons { display: flex; - width: 100%; } @media (max-width: 767px) { - .repository.view.issue .title .issue-title.edit-active { + .repository.view.issue .issue-title { flex-direction: column; } - .repository.view.issue .title .issue-title.edit-active h1 { - margin-right: 0; - margin-bottom: 1rem; - padding-right: 0; - } - .repository.view.issue .title .issue-title.edit-active h1 .ui.input input { - width: calc(100% - 2rem); - } - .repository.view.issue .title .issue-title.edit-active .edit-buttons { - padding-bottom: 1rem; - width: 100%; - } - .repository.view.issue .title .issue-title.edit-active .edit-buttons .button { - width: 100%; - margin-right: 0.5rem; - } - .repository.view.issue .title .issue-title.edit-active .edit-buttons .button:last-child { - margin-right: 0; + .repository.view.issue .edit-buttons { + margin-top: .5rem; } } -.repository.view.issue .title .issue-title h1 { - font-weight: 300; - font-size: 2.3rem; - margin: 0; - padding-right: 0.5rem; -} - -.repository.view.issue .title .issue-title h1 .ui.input { - font-size: 0.5em; - width: 100%; -} - -.repository.view.issue .title .issue-title h1 .ui.input input { - font-size: 1.5em; - padding: 6px 1rem; -} - -.repository.view.issue .title .issue-title .edit-button { - float: right; - padding-left: 1rem; -} - -.repository.view.issue .title .issue-title .edit-buttons { +.repository.view.issue .issue-title { display: flex; + align-items: center; + margin-bottom: 8px; } -.repository.view.issue .title .issue-title .index { +.repository.view.issue .issue-title h1 { + display: flex; + align-items: center; + flex: 1; + width: 100%; + font-weight: 300; + font-size: 32px; + line-height: 40px; + margin: 0; + padding-right: 0.25rem; + min-height: 41px; /* avoid layout shift on edit */ +} + +.repository.view.issue .issue-title h1 .ui.input { + font-size: 0.5em; +} + +.repository.view.issue .issue-title h1 .ui.input input { + font-size: 1.5em; + padding: 2px .5rem; +} + +.repository.view.issue .issue-title .index { color: var(--color-text-light-2); } -.repository.view.issue .title .issue-title .label { +.repository.view.issue .issue-title .label { margin-right: 10px; } -.repository.view.issue .title .issue-title .edit-zone { +.repository.view.issue .issue-title .edit-zone { margin-top: 10px; } +.issue-state-label { + display: flex !important; + align-items: center !important; + font-size: 14px !important; + padding: 7px 10px !important; + border-radius: 6px !important; +} + +.issue-state-label .svg { + margin-right: 4px; +} + .repository.view.issue .pull-desc code { color: var(--color-primary); } @@ -1193,13 +1189,15 @@ .repository .milestone.list { list-style: none; - padding-top: 15px; } .repository .milestone.list > .item { padding-top: 10px; padding-bottom: 10px; - border-bottom: 1px dashed var(--color-secondary); +} + +.repository .milestone.list > .item + .item { + border-top: 1px solid var(--color-secondary); } .repository .milestone.list > .item progress { diff --git a/web_src/css/repository/issue-list.css b/web_src/css/repository/issue-list.css index 2c2d3572e0..dde3e7f19f 100644 --- a/web_src/css/repository/issue-list.css +++ b/web_src/css/repository/issue-list.css @@ -3,6 +3,7 @@ flex-wrap: wrap; align-items: flex-start; gap: 1rem; + margin-top: 1rem; } .issue-list-toolbar-left { diff --git a/web_src/css/repository/list-header.css b/web_src/css/repository/list-header.css index 4130383f89..24aa36dd89 100644 --- a/web_src/css/repository/list-header.css +++ b/web_src/css/repository/list-header.css @@ -26,11 +26,11 @@ flex: 1; } -.small-pill-buttons { +.small-menu-items { min-height: 35.4px !important; /* match .small.button in height */ } -.small-pill-buttons .item { +.small-menu-items .item { padding-top: 6px !important; padding-bottom: 6px !important; } diff --git a/web_src/css/repository/release-tag.css b/web_src/css/repository/release-tag.css index 6922ce5179..700ac46c21 100644 --- a/web_src/css/repository/release-tag.css +++ b/web_src/css/repository/release-tag.css @@ -1,7 +1,6 @@ .repository.releases #release-list { - border-top: 1px solid var(--color-secondary); - margin-top: 20px; - padding-top: 15px; + margin-top: 12px; + padding-top: 12px; padding-left: 0; } @@ -23,29 +22,13 @@ } .repository.releases #release-list > li .meta { + margin-top: 4px; text-align: right; position: relative; } -.repository.releases #release-list > li .meta .label { - margin-right: 0; -} - -.repository.releases #release-list > li .meta .commit { - display: block; - margin-top: 10px; -} - -.repository.releases #release-list > li .meta .choose { - margin-top: 15px; -} - -.repository.releases #release-list > li .meta .choose .button { - margin-right: 0; -} - .repository.releases #release-list > li .detail { - border-left: 2px solid var(--color-secondary); + border-left: 1px solid var(--color-secondary); } .repository.releases #release-list > li .detail .author img { @@ -92,7 +75,7 @@ z-index: 9; position: absolute; display: block; - left: -6px; + left: -5.5px; top: 40px; border-radius: 100%; border: 2.5px solid var(--color-body); diff --git a/web_src/css/themes/theme-arc-green.css b/web_src/css/themes/theme-arc-green.css index 5e47f8ee3e..42cde81802 100644 --- a/web_src/css/themes/theme-arc-green.css +++ b/web_src/css/themes/theme-arc-green.css @@ -29,33 +29,33 @@ --color-primary-alpha-70: #87ab63b3; --color-primary-alpha-80: #87ab63cc; --color-primary-alpha-90: #87ab63e1; - --color-secondary: #454a57; - --color-secondary-dark-1: #505665; - --color-secondary-dark-2: #5b6273; - --color-secondary-dark-3: #71798e; - --color-secondary-dark-4: #7f8699; - --color-secondary-dark-5: #8c93a4; - --color-secondary-dark-6: #9aa0af; - --color-secondary-dark-7: #a8adba; - --color-secondary-dark-8: #b6bac5; - --color-secondary-dark-9: #c4c7d0; - --color-secondary-dark-10: #d2d4db; - --color-secondary-dark-11: #dfe1e6; - --color-secondary-dark-12: #edeef1; + --color-secondary: #525767; + --color-secondary-dark-1: #5c6374; + --color-secondary-dark-2: #666e81; + --color-secondary-dark-3: #7c8497; + --color-secondary-dark-4: #8990a1; + --color-secondary-dark-5: #959cab; + --color-secondary-dark-6: #a2a8b5; + --color-secondary-dark-7: #afb4c0; + --color-secondary-dark-8: #bcc0ca; + --color-secondary-dark-9: #c9cbd4; + --color-secondary-dark-10: #d6d7de; + --color-secondary-dark-11: #e2e3e8; + --color-secondary-dark-12: #eeeff2; --color-secondary-dark-13: #fbfbfc; - --color-secondary-light-1: #373b46; - --color-secondary-light-2: #292c34; - --color-secondary-light-3: #1c1e23; - --color-secondary-light-4: #0e0f11; - --color-secondary-alpha-10: #454a5719; - --color-secondary-alpha-20: #454a5733; - --color-secondary-alpha-30: #454a574b; - --color-secondary-alpha-40: #454a5766; - --color-secondary-alpha-50: #454a5780; - --color-secondary-alpha-60: #454a5799; - --color-secondary-alpha-70: #454a57b3; - --color-secondary-alpha-80: #454a57cc; - --color-secondary-alpha-90: #454a57e1; + --color-secondary-light-1: #454a57; + --color-secondary-light-2: #383c47; + --color-secondary-light-3: #2c2f37; + --color-secondary-light-4: #1f2226; + --color-secondary-alpha-10: #52576719; + --color-secondary-alpha-20: #52576733; + --color-secondary-alpha-30: #5257674b; + --color-secondary-alpha-40: #52576766; + --color-secondary-alpha-50: #52576780; + --color-secondary-alpha-60: #52576799; + --color-secondary-alpha-70: #525767b3; + --color-secondary-alpha-80: #525767cc; + --color-secondary-alpha-90: #525767e1; /* colors */ --color-red: #cc4848; --color-orange: #cc580c; diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index d8451e8399..38a375aa85 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -1,6 +1,6 @@