From 64f2d70262c4cfc1ee74875b4ec920551e304199 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 29 Jun 2023 14:24:22 +0200 Subject: [PATCH] Replace fomantic divider module with our own (#25539) Should look exactly like before for normal dividers. "Horizontal" ones look better because they no longer use image backgrounds. Screenshot 2023-06-27 at 19 07 56 Screenshot 2023-06-27 at 19 05 58 Screenshot 2023-06-27 at 19 00 42 Screenshot 2023-06-27 at 18 58 15 Screenshot 2023-06-27 at 18 56 22 Screenshot 2023-06-27 at 19 21 11 --- templates/admin/config.tmpl | 14 +- templates/admin/dashboard.tmpl | 8 +- templates/admin/stacktrace.tmpl | 2 +- templates/admin/user/edit.tmpl | 8 +- templates/admin/user/list.tmpl | 10 +- templates/explore/code.tmpl | 2 +- templates/explore/repo_search.tmpl | 2 +- templates/explore/search.tmpl | 2 +- templates/install.tmpl | 2 +- templates/org/home.tmpl | 2 +- templates/org/settings/labels.tmpl | 2 +- templates/org/settings/options.tmpl | 6 +- templates/org/team/new.tmpl | 2 +- templates/org/team/teams.tmpl | 2 +- .../package/shared/cleanup_rules/edit.tmpl | 4 +- templates/package/view.tmpl | 6 +- templates/projects/list.tmpl | 2 +- templates/projects/new.tmpl | 2 +- templates/projects/view.tmpl | 6 +- templates/repo/activity.tmpl | 29 +- templates/repo/create.tmpl | 2 +- templates/repo/diff/new_review.tmpl | 2 +- templates/repo/empty.tmpl | 4 +- templates/repo/header.tmpl | 2 +- .../repo/issue/branch_selector_field.tmpl | 2 +- templates/repo/issue/choose.tmpl | 2 +- templates/repo/issue/labels/label_list.tmpl | 4 +- .../issue/labels/labels_selector_field.tmpl | 6 +- templates/repo/issue/list.tmpl | 6 +- templates/repo/issue/milestone_issues.tmpl | 2 +- templates/repo/issue/milestone_new.tmpl | 4 +- templates/repo/issue/new_form.tmpl | 8 +- .../repo/issue/view_content/attachments.tmpl | 4 +- templates/repo/issue/view_content/pull.tmpl | 10 +- .../view_content/pull_merge_instruction.tmpl | 2 +- .../repo/issue/view_content/sidebar.tmpl | 28 +- .../view_content/update_branch_by_merge.tmpl | 2 +- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/git.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/migrating.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- templates/repo/projects/view.tmpl | 6 +- templates/repo/release/new.tmpl | 2 +- templates/repo/release_tag_header.tmpl | 2 +- templates/repo/settings/options.tmpl | 24 +- templates/repo/settings/protected_branch.tmpl | 2 +- templates/repo/settings/webhook/settings.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- templates/shared/actions/runner_edit.tmpl | 4 +- templates/status/404.tmpl | 2 +- templates/status/500.tmpl | 2 +- templates/user/auth/activate.tmpl | 2 +- templates/user/auth/forgot_passwd.tmpl | 2 +- templates/user/auth/reset_passwd.tmpl | 2 +- templates/user/auth/signin_inner.tmpl | 2 +- templates/user/code.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- templates/user/dashboard/navbar.tmpl | 2 +- templates/user/heatmap.tmpl | 2 +- .../notification_subscriptions.tmpl | 2 +- templates/user/settings/profile.tmpl | 4 +- web_src/css/admin.css | 5 - web_src/css/base.css | 14 - web_src/css/helpers.css | 1 + web_src/css/index.css | 1 + web_src/css/modules/divider.css | 39 +++ web_src/css/repo.css | 7 +- web_src/fomantic/build/semantic.css | 296 ------------------ web_src/fomantic/semantic.json | 1 - web_src/js/features/repo-issue-list.js | 2 +- 77 files changed, 190 insertions(+), 471 deletions(-) create mode 100644 web_src/css/modules/divider.css diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 17fb2444d3..c51f9cb0bf 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -20,19 +20,19 @@
{{.locale.Tr "admin.config.disable_router_log"}}
{{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-
+
{{.locale.Tr "admin.config.run_user"}}
{{.RunUser}}
{{.locale.Tr "admin.config.run_mode"}}
{{.RunMode}}
-
+
{{.locale.Tr "admin.config.git_version"}}
{{.GitVersion}}
-
+
{{.locale.Tr "admin.config.repo_root_path"}}
{{.RepoRootPath}}
@@ -174,7 +174,7 @@
{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}
{{.locale.Tr "admin.config.default_enable_dependencies"}}
{{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-
+
{{.locale.Tr "admin.config.active_code_lives"}}
{{.Service.ActiveCodeLives}} {{.locale.Tr "tool.raw_minutes"}}
{{.locale.Tr "admin.config.reset_password_code_lives"}}
@@ -230,7 +230,7 @@ {{end}}
{{.locale.Tr "admin.config.mailer_user"}}
{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}
-
+
{{.locale.Tr "admin.config.send_test_mail"}}
@@ -296,7 +296,7 @@
-
+
{{.locale.Tr "admin.config.enable_federated_avatar"}}
@@ -322,7 +322,7 @@
{{.locale.Tr "admin.config.git_gc_args"}}
{{.Git.GCArgs}}
-
+
{{.locale.Tr "admin.config.git_migrate_timeout"}}
{{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 1dd920c2dd..8312fba039 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -79,7 +79,7 @@
{{.SysStatus.StartTime}}
{{.locale.Tr "admin.dashboard.current_goroutine"}}
{{.SysStatus.NumGoroutine}}
-
+
{{.locale.Tr "admin.dashboard.current_memory_usage"}}
{{.SysStatus.MemAllocated}}
{{.locale.Tr "admin.dashboard.total_memory_allocated"}}
@@ -92,7 +92,7 @@
{{.SysStatus.MemMallocs}}
{{.locale.Tr "admin.dashboard.memory_free_times"}}
{{.SysStatus.MemFrees}}
-
+
{{.locale.Tr "admin.dashboard.current_heap_usage"}}
{{.SysStatus.HeapAlloc}}
{{.locale.Tr "admin.dashboard.heap_memory_obtained"}}
@@ -105,7 +105,7 @@
{{.SysStatus.HeapReleased}}
{{.locale.Tr "admin.dashboard.heap_objects"}}
{{.SysStatus.HeapObjects}}
-
+
{{.locale.Tr "admin.dashboard.bootstrap_stack_usage"}}
{{.SysStatus.StackInuse}}
{{.locale.Tr "admin.dashboard.stack_memory_obtained"}}
@@ -124,7 +124,7 @@
{{.SysStatus.GCSys}}
{{.locale.Tr "admin.dashboard.other_system_allocation_obtained"}}
{{.SysStatus.OtherSys}}
-
+
{{.locale.Tr "admin.dashboard.next_gc_recycle"}}
{{.SysStatus.NextGC}}
{{.locale.Tr "admin.dashboard.last_gc_time"}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index 46ad421587..b9d8e6538f 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -16,7 +16,7 @@ -
+

{{printf "%d Goroutines" .GoroutineCount}}{{/* Goroutine is non-translatable*/}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 75bbd9a97c..96e09156d1 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -79,7 +79,7 @@ -
+
@@ -87,7 +87,7 @@

{{.locale.Tr "admin.users.max_repo_creation_desc"}}

-
+
@@ -135,7 +135,7 @@ {{end}} {{if .TwoFactorEnabled}} -
+
@@ -144,7 +144,7 @@
{{end}} -
+
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 3093b0f47a..3742b4ae85 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -16,19 +16,19 @@ {{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{.locale.Tr "admin.users.list_status_filter.reset"}} -
+
-
+
-
+
-
+
-
+
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index 924a3e6274..c537cca05e 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -3,7 +3,7 @@ {{template "explore/navbar" .}}
{{template "code/searchform" .}} -
+
{{if .CodeIndexerUnavailable}}
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index fbce9dcdd9..6e150dc7f2 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -39,4 +39,4 @@ {{.locale.Tr "explore.relevant_repositories" ((printf "%s%s" $.Link "?only_show_relevant=0")|Escape) | Safe}}
{{end}} -
+
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 11f3b7ba34..b0041ee3ce 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -21,4 +21,4 @@
-
+
diff --git a/templates/install.tmpl b/templates/install.tmpl index 3df4455416..c9f147a64d 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -321,7 +321,7 @@
-
+
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index d540f80352..7f52b8cc6d 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -51,7 +51,7 @@ {{.locale.Tr "new_migrate"}} {{end}}
-
+
{{end}}

{{.locale.Tr "org.members"}} diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index be408617ce..2700c61bb6 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -10,7 +10,7 @@

-
+
{{template "repo/issue/labels/label_new" .}} {{template "repo/issue/labels/label_list" .}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 12a24bff08..846ebaee1a 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -31,7 +31,7 @@ -
+
@@ -65,7 +65,7 @@
{{if .SignedUser.IsAdmin}} -
+
@@ -79,7 +79,7 @@
-
+
{{.CsrfTokenHtml}} diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 0cba09be51..3702198ae0 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -69,7 +69,7 @@
-
+
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index dcf937f3f0..9a7dae8f32 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -7,7 +7,7 @@
{{svg "octicon-plus"}} {{.locale.Tr "org.create_new_team"}}
-
+
{{end}}
diff --git a/templates/package/shared/cleanup_rules/edit.tmpl b/templates/package/shared/cleanup_rules/edit.tmpl index f8525afb70..295ac1a6a4 100644 --- a/templates/package/shared/cleanup_rules/edit.tmpl +++ b/templates/package/shared/cleanup_rules/edit.tmpl @@ -23,7 +23,7 @@
-
+

{{.locale.Tr "packages.owner.settings.cleanuprules.keep.title"}}

@@ -42,7 +42,7 @@

{{.locale.Tr "packages.owner.settings.cleanuprules.keep.pattern.container" | Safe}}

-
+

{{.locale.Tr "packages.owner.settings.cleanuprules.remove.title"}}

diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 755c93fde3..1e7d13285e 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -73,7 +73,7 @@ {{end}}
{{if not (eq .PackageDescriptor.Package.Type "container")}} -
+
{{.locale.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}})
{{range .PackageDescriptor.Files}} @@ -85,7 +85,7 @@
{{end}} {{if .LatestVersions}} -
+
{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}}) {{.locale.Tr "packages.versions.view_all"}}
@@ -98,7 +98,7 @@
{{end}} {{if or .CanWritePackages .HasRepositoryAccess}} -
+
{{if .HasRepositoryAccess}}
{{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "repo.issues"}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index f14dc9d56a..9725c1e63b 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -6,7 +6,7 @@ {{.locale.Tr "repo.projects.new"}}
-
+
{{end}} {{template "base/alert" .}} diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 6d1ae04159..bc3b19e915 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -56,7 +56,7 @@
-
+
{{.locale.Tr "repo.milestones.cancel"}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 35493775b5..59fa1870f8 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -37,7 +37,7 @@
-
+

{{$.Project.Title}}

@@ -69,7 +69,7 @@
{{end}}
-
+
@@ -175,7 +175,7 @@
{{end}} -
+
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index ed29ece137..da4eca7525 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -23,7 +23,7 @@

-
+
{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}

{{.locale.Tr "repo.activity.overview"}}

@@ -115,8 +115,8 @@ {{end}} {{if gt .Activity.PublishedReleaseCount 0}} -

- {{svg "octicon-tag"}} +

+ {{svg "octicon-tag" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.releases_published_by" (.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount) (.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount) @@ -137,8 +137,8 @@ {{end}} {{if gt .Activity.MergedPRCount 0}} -

- {{svg "octicon-git-pull-request"}} +

+ {{svg "octicon-git-pull-request" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.prs_merged_by" (.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount) (.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount) @@ -156,8 +156,8 @@ {{end}} {{if gt .Activity.OpenedPRCount 0}} -

- {{svg "octicon-git-branch"}} +

+ {{svg "octicon-git-branch" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.prs_opened_by" (.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount) (.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount) @@ -175,8 +175,8 @@ {{end}} {{if gt .Activity.ClosedIssueCount 0}} -

- {{svg "octicon-issue-closed"}} +

+ {{svg "octicon-issue-closed" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.issues_closed_from" (.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount) (.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount) @@ -194,8 +194,8 @@ {{end}} {{if gt .Activity.OpenedIssueCount 0}} -

- {{svg "octicon-issue-opened"}} +

+ {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.issues_created_by" (.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount) (.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount) @@ -213,13 +213,10 @@ {{end}} {{if gt .Activity.UnresolvedIssueCount 0}} -

- {{svg "octicon-comment-discussion"}} +

+ {{svg "octicon-comment-discussion" 16 "gt-mr-3"}} {{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}

-
- {{.locale.Tr "repo.activity.unresolved_conv_desc"}} -
{{range .Activity.UnresolvedIssues}}

diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 05e7052ff4..1ec67827e5 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -124,7 +124,7 @@

-
+
diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index 128c1e5504..013fdfe2a8 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -28,7 +28,7 @@ {{template "repo/upload" .}}
{{end}} -
+
{{$showSelfTooltip := (and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID))}} {{if $showSelfTooltip}} diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index 50f209b460..b81b312c6c 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"}}

@@ -58,7 +58,7 @@ git remote add origin {{$.CloneButtonOriginLink.HTTPS git push -u origin {{.Repository.DefaultBranch}}
-
+

{{.locale.Tr "repo.push_exist_repo"}}

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index c1d4676d68..18ed738a20 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -132,7 +132,7 @@ {{end}}
{{if $.CanSignedUserFork}} -
+
{{$.locale.Tr "repo.fork_to_different_account"}} diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 4669c9e8e5..33b2af9c40 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -50,5 +50,5 @@ -
+
{{end}} diff --git a/templates/repo/issue/choose.tmpl b/templates/repo/issue/choose.tmpl index ccfeb7b331..1bbfbbb2d1 100644 --- a/templates/repo/issue/choose.tmpl +++ b/templates/repo/issue/choose.tmpl @@ -6,7 +6,7 @@
{{template "repo/issue/navbar" .}}
-
+
{{range .IssueTemplates}}
diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 325efd1da6..9eee95be92 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -22,10 +22,10 @@
{{if and (not $.PageIsOrgSettingsLabels) (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived)}} {{template "repo/issue/labels/label_load_template" .}} -
+
{{else if and ($.PageIsOrgSettingsLabels) (eq .NumLabels 0)}} {{template "repo/issue/labels/label_load_template" .}} -
+
{{end}}
{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} -
+
{{.locale.Tr "repo.issues.filter_label_select_no_label"}} {{.locale.Tr "repo.issues.filter_label_no_select"}} {{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope $exclusiveScope)}} -
+
{{end}} {{$previousExclusiveScope = $exclusiveScope}} {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} @@ -306,7 +306,7 @@ {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}} -
+
{{end}} {{$previousExclusiveScope = $exclusiveScope}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 3cd84d5456..5913f59fe8 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -48,7 +48,7 @@
{{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness | Safe}}
-
+
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index ac34fb0f0d..1979eb07a5 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -10,7 +10,7 @@
{{end}}
-
+

{{if .PageIsEditMilestone}} {{.locale.Tr "repo.milestones.edit"}} @@ -41,7 +41,7 @@

-
+
{{if .PageIsEditMilestone}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 70c45b37c8..c565be336f 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -55,7 +55,7 @@ {{template "repo/issue/labels/labels_selector_field" .}} {{template "repo/issue/labels/labels_sidebar" dict "root" $}} -
+
@@ -82,7 +82,7 @@
{{if .IsProjectsEnabled}} -
+
@@ -141,7 +141,7 @@
{{end}} -
+
@@ -177,7 +177,7 @@ {{end}}
{{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}} -
+
diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index f342340fe4..981360ebe0 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -1,6 +1,6 @@
{{if .Attachments}} -
+
{{end}} {{$hasThumbnails := false}} {{- range .Attachments -}} @@ -25,7 +25,7 @@ {{end -}} {{if $hasThumbnails}} -
+
{{- range .Attachments -}} {{if FilenameIsImage .Name}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index fd395c0eb6..3666154b20 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -179,7 +179,7 @@ {{end}} {{template "repo/issue/view_content/update_branch_by_merge" $}} {{if .Issue.PullRequest.IsEmpty}} -
+
{{svg "octicon-alert"}} @@ -196,7 +196,7 @@ {{$createdPRMergeStr := TimeSinceUnix .PendingPullRequestMerge.CreatedUnix $.locale}} {{$hasPendingPullRequestMergeTip = $.locale.Tr "repo.pulls.auto_merge_has_pending_schedule" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr}} {{end}} -
+