From 451e838dc45c4063f2468d590014c40f62684189 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 15 Jun 2023 21:34:16 +0200 Subject: [PATCH 01/13] responsive ui improvements --- templates/repo/issue/list.tmpl | 6 +++--- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/search.tmpl | 2 +- web_src/css/repo.css | 13 +++++++++++++ web_src/css/repo/issue-list.css | 13 +++++++++++++ 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 3323bf893e047..13981cecf6902 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -71,13 +71,13 @@ {{template "repo/issue/search" .}} {{if not .Repository.IsArchived}} {{if .PageIsIssueList}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{else}} - {{.locale.Tr "repo.pulls.new"}} + {{.locale.Tr "repo.pulls.new"}} {{end}} {{else}} {{if not .PageIsIssueList}} - {{$.locale.Tr "action.compare_commits_general"}} + {{$.locale.Tr "action.compare_commits_general"}} {{end}} {{end}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 944c6b194a5b2..2f1ea7a659aeb 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -

+

{{.locale.Tr "repo.labels"}} {{.locale.Tr "repo.milestones"}}

diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 97b22d36990c7..13224680bd0c7 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -1,4 +1,4 @@ -
+
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 546fff32f429f..12f8186583322 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -225,6 +225,13 @@ align-items: center; } +@media (max-width: 767.68px) { + .repository.file.list .repo-description { + flex-direction: column; + gap: 8px; + } +} + .repository.file.list #repo-desc { font-size: 1.2em; } @@ -3383,6 +3390,12 @@ tbody.commit-list { margin-bottom: 8px; } +@media (max-width: 767.98px) { + #issue-pins { + grid-template-columns: repeat(1, 1fr); + } +} + .pinned-issue-card { border-radius: var(--border-radius); padding: 8px 10px; diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index dde3e7f19f812..a75ee4e24f9ae 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -13,3 +13,16 @@ .issue-list-toolbar-right { margin-left: auto; } + +@media (max-width: 575.98px) { + .issue-list-navbar { + order: 1 + } + .issue-list-new { + order: 2; + margin-left: auto !important; + } + .issue-list-search { + order: 3 + } +} From 313905fb8331c27c03375fe18b6195a1d24bff93 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 16 Jun 2023 09:44:49 +0200 Subject: [PATCH 02/13] filter, sort improvements --- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- web_src/css/repo/issue-list.css | 13 ++++++++++--- web_src/css/repo/list-header.css | 8 -------- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 13981cecf6902..1a9db7248e32d 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -252,7 +252,7 @@ {{end}} -
+
{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index d7e782e20d62a..3ef8ec90e2003 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -36,7 +36,7 @@ -
+
{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index cbb153a343b22..834a71bbf49de 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -83,7 +83,7 @@
-
+
{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 372d3c7b99f9a..2d3dfdfab9cd1 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -56,7 +56,7 @@
-
+
{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index a75ee4e24f9ae..5938fd9c4d769 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -16,13 +16,20 @@ @media (max-width: 575.98px) { .issue-list-navbar { - order: 1 + order: 0; } .issue-list-new { - order: 2; + order: 1; margin-left: auto !important; } .issue-list-search { - order: 3 + order: 2; + } + .issue-list-toolbar { + flex-direction: column-reverse; + } + .issue-list-toolbar-right { + margin-right: auto; + width: 100%; } } diff --git a/web_src/css/repo/list-header.css b/web_src/css/repo/list-header.css index 69539b035b20c..4230c04e182b6 100644 --- a/web_src/css/repo/list-header.css +++ b/web_src/css/repo/list-header.css @@ -5,14 +5,6 @@ gap: .5rem; } -.list-header-sort { - display: flex; - align-items: center; - justify-content: flex-end; - padding-left: 1rem; - padding-right: 1rem; -} - .list-header-search { display: flex; flex: 1; From c6cf3384be7d5a1bf87c01741700a7100f827fa7 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 16 Jun 2023 21:14:59 +0200 Subject: [PATCH 03/13] milestones; projects; repo search; misc --- templates/projects/list.tmpl | 53 +++++++------ templates/repo/activity.tmpl | 5 +- templates/repo/empty.tmpl | 2 +- templates/repo/issue/list.tmpl | 6 +- templates/repo/issue/milestones.tmpl | 92 +++++++++++++---------- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/search.tmpl | 2 +- templates/repo/projects/list.tmpl | 57 ++++++++------ templates/user/dashboard/issues.tmpl | 6 +- templates/user/dashboard/milestones.tmpl | 94 +++++++++++++----------- web_src/css/helpers.css | 12 +++ web_src/css/repo.css | 39 ++++++++-- web_src/css/repo/issue-list.css | 12 +-- 13 files changed, 229 insertions(+), 153 deletions(-) diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index e9e86e5d5d585..d89bdadc7bf35 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -38,30 +38,41 @@
{{range .Projects}}
  • - {{svg .IconName}} {{.Title}} -
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} - {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} - {{end}} - - {{svg "octicon-issue-opened" 16 "gt-mr-3"}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} - {{svg "octicon-check" 16 "gt-mr-3"}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} - +
    +

    + {{svg .IconName 16 "gt-mr-3"}} + {{.Title}} +

    - {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} - {{if .IsClosed}} - {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} - {{else}} - {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} +
    +
    + {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{if .IsClosed}} +
    + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} +
    + {{end}} +
    + {{svg "octicon-issue-opened"}} + {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} +
    +
    + {{svg "octicon-check"}} + {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} +
    +
    + {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} +
    + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} + {{if .IsClosed}} + {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} + {{else}} + {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} + {{end}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} +
    {{end}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}
    - {{end}} {{if .Description}}
    {{.RenderedContent|Str2html}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 9d15cec051bfe..cfdb7e5802743 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -2,7 +2,10 @@
    {{template "repo/header" .}}
    -

    {{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}} +

    +
    + {{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}} +
    diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index ed726db51238a..9edf9e3c2de0b 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -26,7 +26,7 @@

    {{.locale.Tr "repo.clone_this_repo"}} {{.locale.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}

    -
    +
    {{if and .CanWriteCode (not .Repository.IsArchived)}} {{.locale.Tr "repo.editor.new_file"}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 1a9db7248e32d..97e45999e8364 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -71,13 +71,13 @@ {{template "repo/issue/search" .}} {{if not .Repository.IsArchived}} {{if .PageIsIssueList}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{else}} - {{.locale.Tr "repo.pulls.new"}} + {{.locale.Tr "repo.pulls.new"}} {{end}} {{else}} {{if not .PageIsIssueList}} - {{$.locale.Tr "action.compare_commits_general"}} + {{$.locale.Tr "action.compare_commits_general"}} {{end}} {{end}}
    diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 3ef8ec90e2003..4087587beb3d7 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -13,7 +13,7 @@ {{template "base/alert" .}}
    -
    +
    {{svg "octicon-milestone" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} @@ -25,7 +25,7 @@
    -
    +
    @@ -36,7 +36,7 @@ -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -56,47 +56,59 @@
    {{range .Milestones}}
  • -
    -

    - {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} -

    -
    - {{.Completeness}}% - +
    +
    +

    + {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} +

    +
    + {{.Completeness}}% + +
    -
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} - {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} - {{else}} - {{svg "octicon-calendar"}} - {{if .DeadlineString}} - {{DateTime "short" .DeadlineString}} - {{else}} - {{$.locale.Tr "repo.milestones.no_due_date"}} - {{end}} +
    +
    +
    + {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{if .IsClosed}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} + {{else}} + {{svg "octicon-calendar"}} + {{if .DeadlineString}} + {{DateTime "short" .DeadlineString}} + {{else}} + {{$.locale.Tr "repo.milestones.no_due_date"}} + {{end}} + {{end}} +
    +
    + {{svg "octicon-issue-opened"}} + {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} +
    +
    + {{svg "octicon-check"}} + {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} +
    +
    + {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} +
    +
    + {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}} +
    +
    + {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} +
    + {{svg "octicon-pencil" 16}}{{$.locale.Tr "repo.issues.label_edit"}} + {{if .IsClosed}} + {{svg "octicon-check" 16}}{{$.locale.Tr "repo.milestones.open"}} + {{else}} + {{svg "octicon-x" 16}}{{$.locale.Tr "repo.milestones.close"}} + {{end}} + {{svg "octicon-trash" 16}}{{$.locale.Tr "repo.issues.label_delete"}} +
    {{end}} - - {{svg "octicon-issue-opened" 16 "gt-mr-3"}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} - {{svg "octicon-check" 16 "gt-mr-3"}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} - {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} - {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}} -
    - {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} - {{if .IsClosed}} - {{svg "octicon-check"}} {{$.locale.Tr "repo.milestones.open"}} - {{else}} - {{svg "octicon-x"}} {{$.locale.Tr "repo.milestones.close"}} - {{end}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} -
    - {{end}} {{if .Content}}
    {{.RenderedContent|Str2html}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 2f1ea7a659aeb..785a078905934 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -

    +

    {{.locale.Tr "repo.labels"}} {{.locale.Tr "repo.milestones"}}

    diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 13224680bd0c7..588916a5dd28c 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index a5f99cee66a04..3a57e86981ea7 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -2,7 +2,7 @@
    {{template "repo/header" .}}
    -
    +
    -
    +
    @@ -38,30 +38,41 @@
    {{range .Projects}}
  • - {{svg .IconName}} {{.Title}} -
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} - {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} - {{end}} - - {{svg "octicon-issue-opened" 16 "gt-mr-3"}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} - {{svg "octicon-check" 16 "gt-mr-3"}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} - +
    +

    + {{svg .IconName 16 "gt-mr-3"}} + {{.Title}} +

    - {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} - {{if .IsClosed}} - {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} - {{else}} - {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} +
    +
    + {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{if .IsClosed}} +
    + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} +
    + {{end}} +
    + {{svg "octicon-issue-opened"}} + {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} +
    +
    + {{svg "octicon-check"}} + {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} +
    +
    + {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} +
    + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} + {{if .IsClosed}} + {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} + {{else}} + {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} + {{end}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} +
    {{end}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}
    - {{end}} {{if .Description}}
    {{.RenderedContent|Str2html}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 834a71bbf49de..af27820c3daa4 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"}} @@ -71,7 +71,7 @@ {{.locale.PrettyNumber .IssueStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}}
    - +
    @@ -83,7 +83,7 @@
    -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 2d3dfdfab9cd1..93e534b4126e4 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"}} @@ -45,7 +45,7 @@ {{.locale.PrettyNumber .MilestoneStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}}
    -
    +
    @@ -56,7 +56,7 @@
    -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -74,49 +74,61 @@
    {{range .Milestones}}
  • -
    -

    - {{.Repo.FullName}} - {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} -

    -
    - {{.Completeness}}% - +
    +
    +

    + {{.Repo.FullName}} + {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} +

    +
    + {{.Completeness}}% + +
    -
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} - {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} - {{else}} - {{svg "octicon-calendar"}} - {{if .DeadlineString}} - {{DateTime "short" .DeadlineString}} - {{else}} - {{$.locale.Tr "repo.milestones.no_due_date"}} - {{end}} - {{end}} - - {{svg "octicon-issue-opened" 16 "gt-mr-3"}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} - {{svg "octicon-check" 16 "gt-mr-3"}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} +
    +
    +
    + {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{if .IsClosed}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} + {{else}} + {{svg "octicon-calendar"}} + {{if .DeadlineString}} + {{DateTime "short" .DeadlineString}} + {{else}} + {{$.locale.Tr "repo.milestones.no_due_date"}} + {{end}} + {{end}} +
    +
    + {{svg "octicon-issue-opened"}} + {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} +
    +
    + {{svg "octicon-check"}} + {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} +
    {{if .TotalTrackedTime}} - {{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}} - {{end}} - -
    - {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} - {{if .IsClosed}} - {{svg "octicon-check"}} {{$.locale.Tr "repo.milestones.open"}} - {{else}} - {{svg "octicon-x"}} {{$.locale.Tr "repo.milestones.close"}} +
    + {{svg "octicon-clock"}} + {{.TotalTrackedTime|Sec2Time}} +
    {{end}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} +
    - {{end}} + {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} +
    + {{svg "octicon-pencil" 16}} {{$.locale.Tr "repo.issues.label_edit"}} + {{if .IsClosed}} + {{svg "octicon-check" 16}} {{$.locale.Tr "repo.milestones.open"}} + {{else}} + {{svg "octicon-x" 16}} {{$.locale.Tr "repo.milestones.close"}} + {{end}} + {{svg "octicon-trash" 16}} {{$.locale.Tr "repo.issues.label_delete"}} +
    + {{end}} +
    {{if .Content}}
    {{.RenderedContent|Str2html}} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index eb0cf020689ac..3f71573ec7364 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -12,6 +12,7 @@ Gitea's private styles use `g-` prefix. .gt-tc { text-align: center !important; } .gt-tl { text-align: left !important; } .gt-jc { justify-content: center !important; } +.gt-jb { justify-content: space-between !important; }; .gt-js { justify-content: flex-start !important; } .gt-je { justify-content: flex-end !important; } .gt-sb { justify-content: space-between !important; } @@ -269,6 +270,17 @@ Gitea's private styles use `g-` prefix. .gt-font-17 { font-size: 17px !important } .gt-font-18 { font-size: 18px !important } +@media (max-width: 575.98px) { + .gt-ml-auto-small { margin-left: auto !important; } + + .gt-o-0-small { order: 0 !important; } + .gt-o-1-small { order: 1 !important; } + .gt-o-2-small { order: 2 !important; } + .gt-o-3-small { order: 3 !important; } + .gt-o-4-small { order: 4 !important; } + .gt-o-5-small { order: 5 !important; } +} + @media (max-width: 767.98px) { .gt-db-small { display: block !important; } .gt-w-100-small { width: 100% !important; } diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 12f8186583322..cd5f8b7ead109 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -87,6 +87,12 @@ } } +.projects-toolbar { + display: flex; + justify-content: space-between; + padding-left: 4px; +} + .repository .issue-content-right .menu { overflow-x: auto; max-height: 500px; @@ -229,6 +235,7 @@ .repository.file.list .repo-description { flex-direction: column; gap: 8px; + align-items: normal; } } @@ -1192,23 +1199,29 @@ height: 16px; } +.repository .milestone.list > .item .body { + padding-top: 5px; + display: flex; + flex-wrap: wrap; + gap: 8px; + justify-content: space-between; +} + .repository .milestone.list > .item .meta { color: var(--color-text-light-2); - padding-top: 5px; + display: flex; + flex-wrap: wrap; + gap: 8px; } -.repository .milestone.list > .item .meta .issue-stats .svg { - padding-left: 5px; +.repository .milestone.list > .item .meta .svg { + margin-right: .5rem; } .repository .milestone.list > .item .meta .overdue { color: var(--color-red); } -.repository .milestone.list > .item .operate { - margin-top: -15px; -} - .repository .milestone.list > .item .operate > a { font-size: 15px; padding-top: 5px; @@ -1220,10 +1233,22 @@ color: var(--color-text); } +.repository .milestone.list > .item .operate > a .svg { + margin-right: .5rem; +} + .repository .milestone.list > .item .content { padding-top: 10px; } +@media (max-width: 767.98px) { + .repository .milestone.list > .item { + display: flex; + flex-direction: column; + gap: 8px; + } +} + .repository.new.milestone textarea { height: 200px; } diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 5938fd9c4d769..b53f8e7f6be97 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -14,17 +14,7 @@ margin-left: auto; } -@media (max-width: 575.98px) { - .issue-list-navbar { - order: 0; - } - .issue-list-new { - order: 1; - margin-left: auto !important; - } - .issue-list-search { - order: 2; - } +@media (max-width: 767.98px) { .issue-list-toolbar { flex-direction: column-reverse; } From 042552e44b345bfb96e597f30c471634ff768704 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 16 Jun 2023 21:22:41 +0200 Subject: [PATCH 04/13] remove orphan tag --- templates/user/dashboard/milestones.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 93e534b4126e4..9c26e4218772b 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -115,7 +115,6 @@ {{.TotalTrackedTime|Sec2Time}}
    {{end}} -
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
    From e05475ccc3fef04eb650277cd8a1839bec49ab62 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 17 Jun 2023 08:11:26 +0200 Subject: [PATCH 05/13] remove obsolete tags, chsnge class naming --- templates/projects/list.tmpl | 16 +++++++--------- templates/repo/issue/milestones.tmpl | 20 +++++++++----------- templates/repo/projects/list.tmpl | 14 ++++++-------- templates/user/dashboard/milestones.tmpl | 22 ++++++++++------------ web_src/css/repo.css | 8 ++++---- 5 files changed, 36 insertions(+), 44 deletions(-) diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index d89bdadc7bf35..8fcd026e83164 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -38,13 +38,11 @@
    {{range .Projects}}
  • -
    -

    - {{svg .IconName 16 "gt-mr-3"}} - {{.Title}} -

    -
    -
    +

    + {{svg .IconName 16 "gt-mr-3"}} + {{.Title}} +

    +
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} @@ -62,8 +60,8 @@
    {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} +
    + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} {{else}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 4087587beb3d7..7a825399e6c47 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -56,18 +56,16 @@
    {{range .Milestones}}
  • -
    -
    -

    - {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} -

    -
    - {{.Completeness}}% - -
    +
    +

    + {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} +

    +
    + {{.Completeness}}% +
    -
    +
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} @@ -98,7 +96,7 @@
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} -
    +
    {{svg "octicon-pencil" 16}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} {{svg "octicon-check" 16}}{{$.locale.Tr "repo.milestones.open"}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 3a57e86981ea7..1ed4c45c0ee3a 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -38,13 +38,11 @@
    {{range .Projects}}
  • -
    -

    - {{svg .IconName 16 "gt-mr-3"}} - {{.Title}} -

    -
    -
    +

    + {{svg .IconName 16 "gt-mr-3"}} + {{.Title}} +

    +
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} @@ -62,7 +60,7 @@
    {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} -
    +
    {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 9c26e4218772b..eaa4955f5ce0e 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -74,19 +74,17 @@
    {{range .Milestones}}
  • -
    -
    -

    - {{.Repo.FullName}} - {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} -

    -
    - {{.Completeness}}% - -
    +
    +

    + {{.Repo.FullName}} + {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} +

    +
    + {{.Completeness}}% +
    -
    +
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} @@ -117,7 +115,7 @@ {{end}}
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} -
    +
    {{svg "octicon-pencil" 16}} {{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} {{svg "octicon-check" 16}} {{$.locale.Tr "repo.milestones.open"}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index cd5f8b7ead109..7af5105af759a 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1199,7 +1199,7 @@ height: 16px; } -.repository .milestone.list > .item .body { +.repository .milestone.list > .item .milestone-toolbar { padding-top: 5px; display: flex; flex-wrap: wrap; @@ -1222,18 +1222,18 @@ color: var(--color-red); } -.repository .milestone.list > .item .operate > a { +.repository .milestone.list > .item .operations > a { font-size: 15px; padding-top: 5px; padding-right: 10px; color: var(--color-text-light-2); } -.repository .milestone.list > .item .operate > a:hover { +.repository .milestone.list > .item .operations > a:hover { color: var(--color-text); } -.repository .milestone.list > .item .operate > a .svg { +.repository .milestone.list > .item .operations > a .svg { margin-right: .5rem; } From 21cbed711f4b6efdd45349b3d91fcc03c1a462bc Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 17 Jun 2023 19:04:49 +0200 Subject: [PATCH 06/13] refactor milestone ui style + template --- templates/projects/list.tmpl | 34 +++++------ templates/repo/issue/milestones.tmpl | 70 +++++++++++++---------- templates/repo/projects/list.tmpl | 34 +++++------ templates/user/dashboard/milestones.tmpl | 72 ++++++++++++++---------- web_src/css/index.css | 1 + web_src/css/repo.css | 68 ---------------------- web_src/css/shared/milestone.css | 66 ++++++++++++++++++++++ 7 files changed, 177 insertions(+), 168 deletions(-) create mode 100644 web_src/css/shared/milestone.css diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 8fcd026e83164..fa28a91de370a 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -35,39 +35,33 @@
    -
    +
    {{range .Projects}} -
  • -

    - {{svg .IconName 16 "gt-mr-3"}} +
  • +

    + {{svg .IconName 16}} {{.Title}}

    -
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} - {{if .IsClosed}} -
    - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} -
    - {{end}} -
    - {{svg "octicon-issue-opened"}} +
    +
    + {{svg "octicon-issue-opened" 14}} {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}}
    -
    - {{svg "octicon-check"}} +
    + {{svg "octicon-check" 14}} {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}}
    {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} +
    + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} - {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} + {{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}} {{else}} - {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} + {{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}} {{end}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}
    {{end}}
    diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 7a825399e6c47..0f1612532a93b 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -53,12 +53,13 @@
    -
    +
    {{range .Milestones}} -
  • -
    -

    - {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} +
  • +
    +

    + {{svg "octicon-milestone" 16}} + {{.Name}}

    {{.Completeness}}% @@ -66,44 +67,53 @@
    -
    -
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} +
    +
    + {{svg "octicon-issue-opened" 14}} + {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} +
    +
    + {{svg "octicon-check" 14}} + {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} +
    + {{if .TotalTrackedTime}} +
    + {{svg "octicon-clock"}} + {{.TotalTrackedTime|Sec2Time}} +
    + {{end}} + {{if .UpdatedUnix}} +
    + {{svg "octicon-clock"}} + {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}} +
    + {{end}} +
    {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} + {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{svg "octicon-clock" 14}} + {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{else}} - {{svg "octicon-calendar"}} + {{svg "octicon-calendar" 14}} {{if .DeadlineString}} - {{DateTime "short" .DeadlineString}} + + {{DateTime "short" .DeadlineString}} + {{else}} {{$.locale.Tr "repo.milestones.no_due_date"}} {{end}} {{end}}
    -
    - {{svg "octicon-issue-opened"}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} -
    -
    - {{svg "octicon-check"}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} -
    -
    - {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} -
    -
    - {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}} -
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil" 16}}{{$.locale.Tr "repo.issues.label_edit"}} +
    + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} - {{svg "octicon-check" 16}}{{$.locale.Tr "repo.milestones.open"}} + {{svg "octicon-check" 14}}{{$.locale.Tr "repo.milestones.open"}} {{else}} - {{svg "octicon-x" 16}}{{$.locale.Tr "repo.milestones.close"}} + {{svg "octicon-x" 14}}{{$.locale.Tr "repo.milestones.close"}} {{end}} - {{svg "octicon-trash" 16}}{{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}
    {{end}}
    diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 1ed4c45c0ee3a..6ba3a1a283b17 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -35,39 +35,33 @@
    {{template "base/alert" .}} -
    +
    {{range .Projects}} -
  • -

    - {{svg .IconName 16 "gt-mr-3"}} +
  • +

    + {{svg .IconName 16}} {{.Title}}

    -
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} - {{if .IsClosed}} -
    - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} -
    - {{end}} -
    - {{svg "octicon-issue-opened"}} +
    +
    + {{svg "octicon-issue-opened" 14}} {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}}
    -
    - {{svg "octicon-check"}} +
    + {{svg "octicon-check" 14}} {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}}
    {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} +
    + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} - {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} + {{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}} {{else}} - {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} + {{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}} {{end}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}
    {{end}}
    diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index eaa4955f5ce0e..8597d27f71793 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -71,13 +71,16 @@
    -
    +
    {{range .Milestones}} -
  • -
    -

    - {{.Repo.FullName}} - {{svg "octicon-milestone" 16 "gt-mr-3"}}{{.Name}} +
  • +
    +

    + + {{.Repo.FullName}} + + {{svg "octicon-milestone" 16}} + {{.Name}}

    {{.Completeness}}% @@ -85,44 +88,53 @@
    -
    -
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} - {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} - {{else}} - {{svg "octicon-calendar"}} - {{if .DeadlineString}} - {{DateTime "short" .DeadlineString}} - {{else}} - {{$.locale.Tr "repo.milestones.no_due_date"}} - {{end}} - {{end}} -
    -
    - {{svg "octicon-issue-opened"}} +
    +
    + {{svg "octicon-issue-opened" 14}} {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}}
    -
    - {{svg "octicon-check"}} +
    + {{svg "octicon-check" 14}} {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}}
    {{if .TotalTrackedTime}} -
    +
    {{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}
    {{end}} + {{if .UpdatedUnix}} +
    + {{svg "octicon-clock"}} + {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}} +
    + {{end}} +
    + {{if .IsClosed}} + {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{svg "octicon-clock" 14}} + {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} + {{else}} + {{svg "octicon-calendar" 14}} + {{if .DeadlineString}} + + {{DateTime "short" .DeadlineString}} + + {{else}} + {{$.locale.Tr "repo.milestones.no_due_date"}} + {{end}} + {{end}} +
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil" 16}} {{$.locale.Tr "repo.issues.label_edit"}} +
    + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} - {{svg "octicon-check" 16}} {{$.locale.Tr "repo.milestones.open"}} + {{svg "octicon-check" 14}}{{$.locale.Tr "repo.milestones.open"}} {{else}} - {{svg "octicon-x" 16}} {{$.locale.Tr "repo.milestones.close"}} + {{svg "octicon-x" 14}}{{$.locale.Tr "repo.milestones.close"}} {{end}} - {{svg "octicon-trash" 16}} {{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}
    {{end}}
    diff --git a/web_src/css/index.css b/web_src/css/index.css index c9cc1d8032bba..125249ceab9f5 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -9,6 +9,7 @@ @import "./modules/comment.css"; @import "./shared/issuelist.css"; +@import "./shared/milestone.css"; @import "./shared/repoorg.css"; @import "./shared/settings.css"; diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 7af5105af759a..199942abaa484 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1181,74 +1181,6 @@ margin-top: -8px; } -.repository .milestone.list { - list-style: none; -} - -.repository .milestone.list > .item { - padding-top: 10px; - padding-bottom: 10px; -} - -.repository .milestone.list > .item + .item { - border-top: 1px solid var(--color-secondary); -} - -.repository .milestone.list > .item progress { - width: 200px; - height: 16px; -} - -.repository .milestone.list > .item .milestone-toolbar { - padding-top: 5px; - display: flex; - flex-wrap: wrap; - gap: 8px; - justify-content: space-between; -} - -.repository .milestone.list > .item .meta { - color: var(--color-text-light-2); - display: flex; - flex-wrap: wrap; - gap: 8px; -} - -.repository .milestone.list > .item .meta .svg { - margin-right: .5rem; -} - -.repository .milestone.list > .item .meta .overdue { - color: var(--color-red); -} - -.repository .milestone.list > .item .operations > a { - font-size: 15px; - padding-top: 5px; - padding-right: 10px; - color: var(--color-text-light-2); -} - -.repository .milestone.list > .item .operations > a:hover { - color: var(--color-text); -} - -.repository .milestone.list > .item .operations > a .svg { - margin-right: .5rem; -} - -.repository .milestone.list > .item .content { - padding-top: 10px; -} - -@media (max-width: 767.98px) { - .repository .milestone.list > .item { - display: flex; - flex-direction: column; - gap: 8px; - } -} - .repository.new.milestone textarea { height: 200px; } diff --git a/web_src/css/shared/milestone.css b/web_src/css/shared/milestone.css new file mode 100644 index 0000000000000..f8446153910fb --- /dev/null +++ b/web_src/css/shared/milestone.css @@ -0,0 +1,66 @@ +.milestone-list { + list-style: none; +} + +.milestone-card { + width: 100%; + padding-top: 10px; + padding-bottom: 10px; +} + +.milestone-card + .milestone-card { + border-top: 1px solid var(--color-secondary); +} + +.milestone-card .content { + padding-top: 10px; +} + +@media (max-width: 767.98px) { + .milestone-card { + display: flex; + flex-direction: column; + gap: 8px; + } +} + +.milestone-header progress { + width: 200px; + height: 16px; +} + +.milestone-header { + display: flex; + align-items: center; + margin: 0; + flex-wrap: wrap; + justify-content: space-between; +} + +.milestone-toolbar { + padding-top: 5px; + display: flex; + flex-wrap: wrap; + gap: 8px; + justify-content: space-between; +} + +.milestone-toolbar .group { + color: var(--color-text-light-2); + display: flex; + flex-wrap: wrap; + gap: 8px; +} + +.milestone-toolbar .group .overdue { + color: var(--color-red); +} + +.milestone-toolbar .group > a { + font-size: 15px; + color: var(--color-text-light-2); +} + +.milestone-toolbar .group > a:hover { + color: var(--color-text); +} From 7250cf6b577dc081ea4a93c24d63faa543ac3e3d Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 17 Jun 2023 19:40:41 +0200 Subject: [PATCH 07/13] remove new *-small classes --- templates/repo/issue/list.tmpl | 8 ++++---- templates/repo/issue/milestones.tmpl | 6 +++--- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/search.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 6 +++--- templates/user/dashboard/milestones.tmpl | 6 +++--- web_src/css/helpers.css | 11 ----------- web_src/css/repo/issue-list.css | 10 ++++++++++ web_src/css/repo/list-header.css | 18 ++++++++++++++++++ web_src/css/shared/milestone.css | 23 +++++++++++++++-------- 10 files changed, 58 insertions(+), 34 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 97e45999e8364..80fb5aa89a7d0 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -71,13 +71,13 @@ {{template "repo/issue/search" .}} {{if not .Repository.IsArchived}} {{if .PageIsIssueList}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{else}} - {{.locale.Tr "repo.pulls.new"}} + {{.locale.Tr "repo.pulls.new"}} {{end}} {{else}} {{if not .PageIsIssueList}} - {{$.locale.Tr "action.compare_commits_general"}} + {{$.locale.Tr "action.compare_commits_general"}} {{end}} {{end}}
    @@ -252,7 +252,7 @@ {{end}} -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 0f1612532a93b..d1c80df4f37e4 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -13,7 +13,7 @@ {{template "base/alert" .}}
    -
    +
    {{svg "octicon-milestone" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} @@ -25,7 +25,7 @@
    -
    +
    @@ -36,7 +36,7 @@ -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 785a078905934..2f1ea7a659aeb 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -

    +

    {{.locale.Tr "repo.labels"}} {{.locale.Tr "repo.milestones"}}

    diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 588916a5dd28c..13224680bd0c7 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index af27820c3daa4..ca99c016e5aca 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"}} @@ -71,7 +71,7 @@ {{.locale.PrettyNumber .IssueStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}}
    - +
    @@ -83,7 +83,7 @@
    -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 8597d27f71793..d993312b47683 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"}} @@ -45,7 +45,7 @@ {{.locale.PrettyNumber .MilestoneStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}}
    -
    +
    @@ -56,7 +56,7 @@
    -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 3f71573ec7364..d62fc01debe67 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -270,17 +270,6 @@ Gitea's private styles use `g-` prefix. .gt-font-17 { font-size: 17px !important } .gt-font-18 { font-size: 18px !important } -@media (max-width: 575.98px) { - .gt-ml-auto-small { margin-left: auto !important; } - - .gt-o-0-small { order: 0 !important; } - .gt-o-1-small { order: 1 !important; } - .gt-o-2-small { order: 2 !important; } - .gt-o-3-small { order: 3 !important; } - .gt-o-4-small { order: 4 !important; } - .gt-o-5-small { order: 5 !important; } -} - @media (max-width: 767.98px) { .gt-db-small { display: block !important; } .gt-w-100-small { width: 100% !important; } diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index b53f8e7f6be97..ddd425d068bff 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -22,4 +22,14 @@ margin-right: auto; width: 100%; } + .issue-list-navbar { + order: 0; + } + .issue-list-new { + order: 1; + margin-left: auto !important; + } + .issue-list-search { + order: 2 !important; + } } diff --git a/web_src/css/repo/list-header.css b/web_src/css/repo/list-header.css index 4230c04e182b6..21612b4b522aa 100644 --- a/web_src/css/repo/list-header.css +++ b/web_src/css/repo/list-header.css @@ -18,6 +18,11 @@ flex: 1; } +.list-header-sort { + padding-left: 1rem; + padding-right: 1rem; +} + .small-menu-items { min-height: 35.4px !important; /* match .small.button in height */ background: none !important; /* fomantic sets a color here which does not play well with active transparent color on the item, so unset and set the colors on the item */ @@ -36,3 +41,16 @@ .small-menu-items .item.active { background: var(--color-active) !important; } + +@media (max-width: 747.98px) { + .list-header-search { + order: 0; + } + .list-header-toggle { + order: 1; + } + .list-header-sort { + order: 2; + margin-left: auto; + } +} diff --git a/web_src/css/shared/milestone.css b/web_src/css/shared/milestone.css index f8446153910fb..b8096669a9b7e 100644 --- a/web_src/css/shared/milestone.css +++ b/web_src/css/shared/milestone.css @@ -16,14 +16,6 @@ padding-top: 10px; } -@media (max-width: 767.98px) { - .milestone-card { - display: flex; - flex-direction: column; - gap: 8px; - } -} - .milestone-header progress { width: 200px; height: 16px; @@ -64,3 +56,18 @@ .milestone-toolbar .group > a:hover { color: var(--color-text); } + +@media (max-width: 767.98px) { + .milestones-toggle { + order: 1; + } + .milestones-sort { + order: 2; + margin-left: auto; + } + .milestone-card { + display: flex; + flex-direction: column; + gap: 8px; + } + } From 7c12895f34d34284e78c2089c92cb0da8435baa5 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 17 Jun 2023 19:44:55 +0200 Subject: [PATCH 08/13] restore unneeded changes --- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 80fb5aa89a7d0..313f7d6e9889d 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -252,7 +252,7 @@ {{end}} -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index d1c80df4f37e4..8f54ef59c2235 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -36,7 +36,7 @@ -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index ca99c016e5aca..e7762c5a93609 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -83,7 +83,7 @@
    -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index d993312b47683..13a6df3db97e0 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -56,7 +56,7 @@
    -
    +
    {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} From 421509275b597ac0010d7b523787aae34345e420 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 17 Jun 2023 19:56:01 +0200 Subject: [PATCH 09/13] restore unneeded changes --- web_src/css/repo/list-header.css | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web_src/css/repo/list-header.css b/web_src/css/repo/list-header.css index 21612b4b522aa..718df55dcf201 100644 --- a/web_src/css/repo/list-header.css +++ b/web_src/css/repo/list-header.css @@ -5,6 +5,13 @@ gap: .5rem; } +.list-header-sort { + display: flex; + align-items: center; + padding-left: 1rem; + padding-right: 1rem; +} + .list-header-search { display: flex; flex: 1; @@ -18,11 +25,6 @@ flex: 1; } -.list-header-sort { - padding-left: 1rem; - padding-right: 1rem; -} - .small-menu-items { min-height: 35.4px !important; /* match .small.button in height */ background: none !important; /* fomantic sets a color here which does not play well with active transparent color on the item, so unset and set the colors on the item */ From 4b69d514b5b1138e6e9c6a6f2be18770f928f725 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 17 Jun 2023 20:12:44 +0200 Subject: [PATCH 10/13] fix activity page changes --- templates/repo/activity.tmpl | 40 ++++++++++++++------------------ web_src/css/helpers.css | 1 - web_src/css/repo.css | 7 ++++++ web_src/css/shared/milestone.css | 17 ++++---------- 4 files changed, 30 insertions(+), 35 deletions(-) diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index cfdb7e5802743..ed29ece137811 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -2,28 +2,24 @@
    {{template "repo/header" .}}
    -

    -
    - {{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}} -
    -
    - -
    -
    - - {{.locale.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
    -
    - {{.locale.Tr "repo.activity.period.daily"}} - {{.locale.Tr "repo.activity.period.halfweekly"}} - {{.locale.Tr "repo.activity.period.weekly"}} - {{.locale.Tr "repo.activity.period.monthly"}} - {{.locale.Tr "repo.activity.period.quarterly"}} - {{.locale.Tr "repo.activity.period.semiyearly"}} - {{.locale.Tr "repo.activity.period.yearly"}} -
    +

    + {{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}} + +
    +
    + + {{.locale.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
    +
    + {{.locale.Tr "repo.activity.period.daily"}} + {{.locale.Tr "repo.activity.period.halfweekly"}} + {{.locale.Tr "repo.activity.period.weekly"}} + {{.locale.Tr "repo.activity.period.monthly"}} + {{.locale.Tr "repo.activity.period.quarterly"}} + {{.locale.Tr "repo.activity.period.semiyearly"}} + {{.locale.Tr "repo.activity.period.yearly"}}

    diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index d62fc01debe67..eb0cf020689ac 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -12,7 +12,6 @@ Gitea's private styles use `g-` prefix. .gt-tc { text-align: center !important; } .gt-tl { text-align: left !important; } .gt-jc { justify-content: center !important; } -.gt-jb { justify-content: space-between !important; }; .gt-js { justify-content: flex-start !important; } .gt-je { justify-content: flex-end !important; } .gt-sb { justify-content: space-between !important; } diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 199942abaa484..d72a48a0e4460 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1930,6 +1930,13 @@ } } +.repository .activity-header { + display: flex; + justify-content: space-between; + gap: 8px; + flex-wrap: wrap; +} + .repository.settings.collaboration .collaborator.list { padding: 0; } diff --git a/web_src/css/shared/milestone.css b/web_src/css/shared/milestone.css index b8096669a9b7e..511a1be714e07 100644 --- a/web_src/css/shared/milestone.css +++ b/web_src/css/shared/milestone.css @@ -58,16 +58,9 @@ } @media (max-width: 767.98px) { - .milestones-toggle { - order: 1; - } - .milestones-sort { - order: 2; - margin-left: auto; - } - .milestone-card { - display: flex; - flex-direction: column; - gap: 8px; - } + .milestone-card { + display: flex; + flex-direction: column; + gap: 8px; } +} From aa949673f9e7878b3903d38e0f086b35e6d7779d Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 17 Jun 2023 20:32:51 +0200 Subject: [PATCH 11/13] fix emptry repo; projects list header --- templates/repo/empty.tmpl | 2 +- templates/repo/projects/list.tmpl | 2 +- web_src/css/repo.css | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index 9edf9e3c2de0b..a08de7f2ca85b 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -26,7 +26,7 @@

    {{.locale.Tr "repo.clone_this_repo"}} {{.locale.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}

    -
    +
    {{if and .CanWriteCode (not .Repository.IsArchived)}} {{.locale.Tr "repo.editor.new_file"}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 6ba3a1a283b17..79db2e5960cf4 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -2,7 +2,7 @@
    {{template "repo/header" .}}
    -
    +
    diff --git a/web_src/css/repo.css b/web_src/css/repo.css index d72a48a0e4460..60a2f97a3fad7 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -87,6 +87,12 @@ } } +.projects-header { + margin-bottom: 1rem; + flex-direction: column; + gap: 8px; +} + .projects-toolbar { display: flex; justify-content: space-between; From 1e5bb768c90648d3de975389c63a094ee07798e5 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 02:37:08 +0200 Subject: [PATCH 12/13] remove divider margin on new repo page --- templates/repo/empty.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index a08de7f2ca85b..50f209b460f83 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -44,7 +44,7 @@
    {{if not .Repository.IsArchived}} -
    +

    {{.locale.Tr "repo.create_new_repo_command"}}

    From 8cf1e37f69b1583e157ac6d5489806433a6cdbc9 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 18 Jun 2023 08:18:16 +0200 Subject: [PATCH 13/13] fix breakpoint; remove dead code --- templates/projects/list.tmpl | 4 ++-- templates/projects/view.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 4 ++-- templates/repo/projects/list.tmpl | 4 ++-- templates/repo/projects/view.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 4 ++-- web_src/css/repo/list-header.css | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index fa28a91de370a..bde9925ab98e7 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -55,13 +55,13 @@
    {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
    - {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} {{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}} {{else}} {{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}} {{end}} - {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}} tesssst
    {{end}}
    diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index a7209e0c21743..58dbca2a4bd1b 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -46,7 +46,7 @@ {{if $.CanWriteProjects}}
    - + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 8f54ef59c2235..46bb060877334 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -107,13 +107,13 @@
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
    - {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} {{svg "octicon-check" 14}}{{$.locale.Tr "repo.milestones.open"}} {{else}} {{svg "octicon-x" 14}}{{$.locale.Tr "repo.milestones.close"}} {{end}} - {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}
    {{end}}
    diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 79db2e5960cf4..674c6bfb626b5 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -55,13 +55,13 @@
    {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
    - {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} {{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}} {{else}} {{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}} {{end}} - {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}
    {{end}}
    diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 068c42838a571..f8215cbee1c06 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -50,7 +50,7 @@ {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
    - + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 13a6df3db97e0..23b7b27116bbc 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -128,13 +128,13 @@
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
    - {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} {{svg "octicon-check" 14}}{{$.locale.Tr "repo.milestones.open"}} {{else}} {{svg "octicon-x" 14}}{{$.locale.Tr "repo.milestones.close"}} {{end}} - {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}
    {{end}}
    diff --git a/web_src/css/repo/list-header.css b/web_src/css/repo/list-header.css index 718df55dcf201..304cfbc13c9ed 100644 --- a/web_src/css/repo/list-header.css +++ b/web_src/css/repo/list-header.css @@ -44,7 +44,7 @@ background: var(--color-active) !important; } -@media (max-width: 747.98px) { +@media (max-width: 767.98px) { .list-header-search { order: 0; }