From 9da3d78e74d6c8f363799dc2157540ea005ea102 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 20 May 2022 00:08:08 +0200 Subject: [PATCH] Replace blue button and label classes with primary (#19763) * make blue really blue * replace blue button and label classes with primary * add --color-blue-dark * add light color variants, tweak a few colors * fix colors * add comment Co-authored-by: wxiaoguang --- templates/admin/auth/list.tmpl | 2 +- templates/admin/base/search.tmpl | 2 +- templates/admin/emails/list.tmpl | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/process.tmpl | 2 +- templates/admin/repo/list.tmpl | 2 +- templates/admin/repo/search.tmpl | 2 +- templates/admin/repo/unadopted.tmpl | 4 +- templates/admin/stacktrace.tmpl | 2 +- templates/admin/user/list.tmpl | 4 +- templates/base/head_navbar.tmpl | 2 +- templates/explore/code.tmpl | 2 +- templates/explore/repo_search.tmpl | 2 +- templates/explore/search.tmpl | 2 +- templates/org/home.tmpl | 2 +- templates/org/team/sidebar.tmpl | 2 +- templates/org/team/teams.tmpl | 2 +- templates/package/shared/list.tmpl | 2 +- templates/package/shared/versionlist.tmpl | 2 +- templates/repo/commit_page.tmpl | 10 ++-- templates/repo/diff/box.tmpl | 2 +- templates/repo/editor/cherry_pick.tmpl | 2 +- templates/repo/header.tmpl | 8 +-- templates/repo/home.tmpl | 2 +- .../issue/labels/label_load_template.tmpl | 2 +- templates/repo/issue/labels/label_new.tmpl | 4 +- templates/repo/issue/milestone_new.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/issue/search.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 4 +- .../repo/issue/view_content/reactions.tmpl | 2 +- templates/repo/issue/view_title.tmpl | 6 +- templates/repo/projects/new.tmpl | 2 +- templates/repo/pulls/tab_menu.tmpl | 6 +- templates/repo/settings/branches.tmpl | 2 +- templates/repo/settings/deploy_keys.tmpl | 4 +- templates/repo/settings/lfs_file.tmpl | 2 +- templates/repo/settings/lfs_file_find.tmpl | 4 +- templates/repo/settings/lfs_locks.tmpl | 4 +- templates/repo/settings/lfs_pointers.tmpl | 2 +- templates/repo/settings/options.tmpl | 4 +- templates/repo/settings/tags.tmpl | 4 +- .../repo/settings/webhook/base_list.tmpl | 2 +- templates/repo/settings/webhook/history.tmpl | 2 +- templates/user/auth/activate.tmpl | 2 +- templates/user/auth/forgot_passwd.tmpl | 2 +- templates/user/auth/reset_passwd.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 16 ++--- templates/user/dashboard/milestones.tmpl | 4 +- templates/user/dashboard/navbar.tmpl | 2 +- templates/user/settings/account.tmpl | 8 +-- templates/user/settings/keys_gpg.tmpl | 4 +- templates/user/settings/keys_principal.tmpl | 4 +- templates/user/settings/keys_ssh.tmpl | 6 +- templates/user/settings/organization.tmpl | 4 +- templates/user/settings/security/twofa.tmpl | 2 +- web_src/js/features/comp/ReactionSelector.js | 2 +- web_src/js/features/repo-home.js | 2 - web_src/less/_base.less | 59 +++++++++++-------- web_src/less/_repository.less | 6 +- 61 files changed, 132 insertions(+), 123 deletions(-) diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index b4a703e41..f1b4da35e 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "admin.auths.auth_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
- {{.i18n.Tr "admin.auths.new"}} + {{.i18n.Tr "admin.auths.new"}}

diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index 98fd3f4a0..4ec62c162 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -18,6 +18,6 @@
- +
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 277c777a8..92444efbd 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -25,7 +25,7 @@
- +
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 0782ef64e..1cfd3e79e 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
- {{.i18n.Tr "admin.orgs.new_orga"}} + {{.i18n.Tr "admin.orgs.new_orga"}}

diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index df89d8bed..6b19c09a1 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -24,7 +24,7 @@ - +
diff --git a/templates/admin/process.tmpl b/templates/admin/process.tmpl index c44300dbb..51bf1d48f 100644 --- a/templates/admin/process.tmpl +++ b/templates/admin/process.tmpl @@ -1,7 +1,7 @@

{{.i18n.Tr "admin.monitor.process"}}
- {{.i18n.Tr "admin.monitor.stacktrace"}} + {{.i18n.Tr "admin.monitor.stacktrace"}}

diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index da05bfab9..96f04b8fe 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
- {{.i18n.Tr "admin.repos.unadopted"}} + {{.i18n.Tr "admin.repos.unadopted"}}

diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl index 8b1deb913..e51d50936 100644 --- a/templates/admin/repo/search.tmpl +++ b/templates/admin/repo/search.tmpl @@ -24,6 +24,6 @@
- +
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index 345f59401..cd04891d7 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "admin.repos.unadopted"}}
- {{.i18n.Tr "admin.repos.repo_manage_panel"}} + {{.i18n.Tr "admin.repos.repo_manage_panel"}}

@@ -14,7 +14,7 @@
- +
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index 68dfbe066..5c3993e23 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "admin.monitor.stacktrace"}}: {{.i18n.Tr "admin.monitor.goroutines" .GoroutineCount}}
- {{.i18n.Tr "admin.monitor"}} + {{.i18n.Tr "admin.monitor"}}

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 755e4436f..963a440e2 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "admin.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
- {{.i18n.Tr "admin.users.new_account"}} + {{.i18n.Tr "admin.users.new_account"}}

@@ -56,7 +56,7 @@
- +
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 5ce1d0b88..babf244f9 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -77,7 +77,7 @@ {{svg "octicon-issue-opened"}} {{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}} - + {{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}} diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index e1056ab31..2801cdfaf 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -14,7 +14,7 @@
{{.i18n.Tr "explore.search.match"}}
- +
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index bc4572dfc..3d45305df 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -27,7 +27,7 @@
- +
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 245cc9f34..2c1687f60 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -19,7 +19,7 @@
- +
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 1fe0b035e..a49029d4d 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -78,7 +78,7 @@ {{if .IsOrganizationOwner}}
- {{.i18n.Tr "org.create_new_team"}} + {{.i18n.Tr "org.create_new_team"}}
{{end}} {{end}} diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 8adee3cc7..d597d1349 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -12,7 +12,7 @@
{{$.CsrfTokenHtml}} - +
{{end}} diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 9165a62bc..49407ef19 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -25,7 +25,7 @@ {{else if $.IsOrganizationOwner}}
{{$.CsrfTokenHtml}} - +
{{end}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 9e6bf5ce9..ce2b57e4a 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -17,7 +17,7 @@ - +
diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index e2aa19cc8..59f7cd164 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -10,7 +10,7 @@ {{end}} - +
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 70cc7d02e..1e6296836 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -22,11 +22,11 @@

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

{{if not $.PageIsWiki}}
- + {{.i18n.Tr "repo.diff.browse_source"}} {{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}{{- /* */ -}} -
{{.i18n.Tr "repo.commit.actions"}} +
{{.i18n.Tr "repo.commit.actions"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}{{.i18n.Tr "repo.commit.actions"}}
{{.i18n.Tr "repo.commit.actions"}}
@@ -174,16 +174,16 @@ {{.i18n.Tr "repo.diff.parent"}} {{range .Parents}} {{if $.PageIsWiki}} - {{ShortSha .}} + {{ShortSha .}} {{else}} - {{ShortSha .}} + {{ShortSha .}} {{end}} {{end}}
{{end}}
{{.i18n.Tr "repo.diff.commit"}} - {{ShortSha .CommitID}} + {{ShortSha .CommitID}}
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index bfac8c52e..02c7dcd68 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -186,7 +186,7 @@ {{$.i18n.Tr "loading"}}
-
{{.i18n.Tr "repo.issues.cancel"}}
+
{{.i18n.Tr "repo.issues.cancel"}}
{{.i18n.Tr "repo.issues.save"}}
diff --git a/templates/repo/editor/cherry_pick.tmpl b/templates/repo/editor/cherry_pick.tmpl index 9cdda2ea8..15f518f90 100644 --- a/templates/repo/editor/cherry_pick.tmpl +++ b/templates/repo/editor/cherry_pick.tmpl @@ -12,7 +12,7 @@
{{$shaurl := printf "%s/commit/%s" $.RepoLink (PathEscape .SHA)}} - {{$shalink := printf "%s" (Escape $shaurl) (ShortSha .SHA)}} + {{$shalink := printf "%s" (Escape $shaurl) (ShortSha .SHA)}} {{if eq .CherryPickType "revert"}} {{.i18n.Tr "repo.editor.revert" $shalink | Str2html}} {{else}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 57c665986..2d963d67c 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -158,7 +158,7 @@ {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues"}} {{if .Repository.NumOpenIssues}} - {{CountFmt .Repository.NumOpenIssues}} + {{CountFmt .Repository.NumOpenIssues}} {{end}} {{end}} @@ -173,7 +173,7 @@ {{svg "octicon-git-pull-request"}} {{.i18n.Tr "repo.pulls"}} {{if .Repository.NumOpenPulls}} - {{CountFmt .Repository.NumOpenPulls}} + {{CountFmt .Repository.NumOpenPulls}} {{end}} {{end}} @@ -188,7 +188,7 @@ {{svg "octicon-project"}} {{.i18n.Tr "repo.project_board"}} {{if .Repository.NumOpenProjects}} - {{CountFmt .Repository.NumOpenProjects}} + {{CountFmt .Repository.NumOpenProjects}} {{end}} {{ end }} @@ -197,7 +197,7 @@ {{svg "octicon-tag"}} {{.i18n.Tr "repo.releases"}} {{if .NumReleases}} - {{CountFmt .NumReleases}} + {{CountFmt .NumReleases}} {{end}} {{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index afdb176bb..c3d4d4cb2 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -106,7 +106,7 @@
{{if eq $n 0}} {{if .Repository.IsTemplate}} -
+
{{.i18n.Tr "repo.use_template"}} diff --git a/templates/repo/issue/labels/label_load_template.tmpl b/templates/repo/issue/labels/label_load_template.tmpl index e75a7bef5..ee459052d 100644 --- a/templates/repo/issue/labels/label_load_template.tmpl +++ b/templates/repo/issue/labels/label_load_template.tmpl @@ -17,7 +17,7 @@ {{svg "octicon-triangle-down" 18 "dropdown icon"}}
- +
diff --git a/templates/repo/issue/labels/label_new.tmpl b/templates/repo/issue/labels/label_new.tmpl index 15a6c029a..a7c30bd22 100644 --- a/templates/repo/issue/labels/label_new.tmpl +++ b/templates/repo/issue/labels/label_new.tmpl @@ -19,8 +19,8 @@ {{template "repo/issue/label_precolors"}}
-
{{.i18n.Tr "repo.milestones.cancel"}}
- +
{{.i18n.Tr "repo.milestones.cancel"}}
+
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index 94d31d627..178b2c9db 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -44,7 +44,7 @@
{{if .PageIsEditMilestone}} - + {{.i18n.Tr "repo.milestones.cancel"}} +
diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index f7ca49e66..8fd31a231 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -6,6 +6,6 @@ - + diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 91af5160b..8d4fc4f8b 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -215,8 +215,8 @@ {{end}}
-
{{.i18n.Tr "repo.issues.cancel"}}
-
{{.i18n.Tr "repo.issues.save"}}
+
{{.i18n.Tr "repo.issues.cancel"}}
+
{{.i18n.Tr "repo.issues.save"}}
diff --git a/templates/repo/issue/view_content/reactions.tmpl b/templates/repo/issue/view_content/reactions.tmpl index 4978edf3f..4e0efca87 100644 --- a/templates/repo/issue/view_content/reactions.tmpl +++ b/templates/repo/issue/view_content/reactions.tmpl @@ -1,5 +1,5 @@ {{range $key, $value := .Reactions}} - + {{ReactionToEmoji $key}} {{len $value}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 707b8252f..22ad58876 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -2,7 +2,7 @@
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
-
{{.i18n.Tr "repo.issues.edit"}}
+
{{.i18n.Tr "repo.issues.edit"}}
{{end}}

@@ -14,8 +14,8 @@

{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
- - + +
{{end}}
diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl index e015f7d7a..e801959aa 100644 --- a/templates/repo/projects/new.tmpl +++ b/templates/repo/projects/new.tmpl @@ -50,7 +50,7 @@
{{if .PageIsEditProjects}} - + {{.i18n.Tr "repo.milestones.cancel"}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 5671eca36..dbc115ec4 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -66,7 +66,7 @@ {{range .ProtectedBranches}} -
{{.BranchName}}
+
{{.BranchName}}
{{$.i18n.Tr "repo.settings.edit_protected_branch"}} {{else}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 019a62b5f..6b9e129d9 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -8,9 +8,9 @@ {{.i18n.Tr "repo.settings.deploy_keys"}}
{{if not .DisableSSH}} -
{{.i18n.Tr "repo.settings.add_deploy_key"}}
+
{{.i18n.Tr "repo.settings.add_deploy_key"}}
{{else}} -
{{.i18n.Tr "settings.ssh_disabled"}}
+
{{.i18n.Tr "settings.ssh_disabled"}}
{{end}}
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index a4d6b21f1..0c8eff122 100644 --- a/templates/repo/settings/lfs_file.tmpl +++ b/templates/repo/settings/lfs_file.tmpl @@ -12,7 +12,7 @@ {{.i18n.Tr "repo.escape_control_characters"}} {{end}} - {{$.i18n.Tr "repo.settings.lfs_findcommits"}} + {{$.i18n.Tr "repo.settings.lfs_findcommits"}}
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl index 60caf46fe..77e49989d 100644 --- a/templates/repo/settings/lfs_file_find.tmpl +++ b/templates/repo/settings/lfs_file_find.tmpl @@ -30,12 +30,12 @@ {{if .ParentHashes}} {{$.i18n.Tr "repo.diff.parent"}} {{range .ParentHashes}} - {{ShortSha .String}} + {{ShortSha .String}} {{end}} {{end}}
{{$.i18n.Tr "repo.diff.commit"}} - {{ShortSha .SHA}} + {{ShortSha .SHA}} {{TimeSince .When $.i18n.Lang}} diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl index d30575a05..507938145 100644 --- a/templates/repo/settings/lfs_locks.tmpl +++ b/templates/repo/settings/lfs_locks.tmpl @@ -13,7 +13,7 @@ {{$.CsrfTokenHtml}}
- +
@@ -43,7 +43,7 @@
{{$.CsrfTokenHtml}} - +
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index 440e54423..159ee94f9 100644 --- a/templates/repo/settings/lfs_pointers.tmpl +++ b/templates/repo/settings/lfs_pointers.tmpl @@ -56,7 +56,7 @@ - {{$.i18n.Tr "repo.settings.lfs_findcommits"}} + {{$.i18n.Tr "repo.settings.lfs_findcommits"}} {{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 77897f25c..e2d6c5e1d 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -98,7 +98,7 @@
{{.CsrfTokenHtml}} - +
@@ -183,7 +183,7 @@ {{$.CsrfTokenHtml}} - + diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index 48c42bdf2..8e67285dd 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -65,7 +65,7 @@ - + {{$.i18n.Tr "cancel"}} {{else}} @@ -110,7 +110,7 @@ {{end}} - {{$.i18n.Tr "edit"}} + {{$.i18n.Tr "edit"}}
{{$.CsrfTokenHtml}} diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index b1a3771bd..e2416607c 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -2,7 +2,7 @@ {{.Title}}
-
{{.i18n.Tr "repo.settings.add_webhook"}}
+
{{.i18n.Tr "repo.settings.add_webhook"}}
{{.i18n.Tr "repo.settings.web_hook_name_gitea"}} diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index a719e4453..8b205ad79 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -18,7 +18,7 @@ {{else}} {{svg "octicon-alert"}} {{end}} - {{.UUID}} + {{.UUID}}
{{.DeliveredString}} diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 65dfd6b6a..bb5d2a16f 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -38,7 +38,7 @@

{{.i18n.Tr "auth.has_unconfirmed_mail" (.SignedUser.Name|Escape) (.SignedUser.Email|Escape) | Str2html}}

- +
{{end}} {{end}} diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index 2ff7acb97..59789ef7c 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -19,7 +19,7 @@
- +
{{else if .IsResetDisable}}

diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl index 927cf6f5c..66d4ffc11 100644 --- a/templates/user/auth/reset_passwd.tmpl +++ b/templates/user/auth/reset_passwd.tmpl @@ -51,7 +51,7 @@

- + {{if and .has_two_factor (not .scratch_code)}} {{.i18n.Tr "auth.use_scratch_code" | Str2html}} {{end}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index dc66859b8..ffaf5bb4e 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -5,36 +5,36 @@
- + {{.i18n.Tr "home.issues.in_your_repos"}} {{CountFmt .IssueStats.YourRepositoriesCount}} - + {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} {{CountFmt .IssueStats.AssignCount}} - + {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} {{CountFmt .IssueStats.CreateCount}} - + {{.i18n.Tr "repo.issues.filter_type.mentioning_you"}} {{CountFmt .IssueStats.MentionCount}} {{if .PageIsPulls}} - + {{.i18n.Tr "repo.issues.filter_type.review_requested"}} {{CountFmt .IssueStats.ReviewRequestedCount}} {{end}}
- + All
{{CountFmt .TotalIssueCount}}
 {{range .Repos}} {{with $Repo := .}} - - +
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index a650a5d31..c551c91e3 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -12,7 +12,7 @@
{{range .Repos}} {{with $Repo := .}} - - +
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 7127abeb0..75abe859e 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -95,7 +95,7 @@ {{end}}
- + {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 40)}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 3753a77ce..3662ec0fa 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -83,7 +83,7 @@ {{$.CsrfTokenHtml}} - +
{{end}} @@ -95,9 +95,9 @@ {{if $.ActivationsPending}} - + {{else}} - + {{end}}
@@ -105,7 +105,7 @@
{{.Email}} {{if .IsPrimary}} -
{{$.i18n.Tr "settings.primary"}}
+
{{$.i18n.Tr "settings.primary"}}
{{end}} {{if .IsActivated}}
{{$.i18n.Tr "settings.activated"}}
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 81f9bf20b..52fc0a503 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -1,7 +1,7 @@

{{.i18n.Tr "settings.manage_gpg_keys"}}
-
{{.i18n.Tr "settings.add_key"}}
+
{{.i18n.Tr "settings.add_key"}}

@@ -50,7 +50,7 @@ {{$.i18n.Tr "settings.delete_key"}} {{if and (not .Verified) (ne $.VerifyingID .KeyID)}} - {{$.i18n.Tr "settings.gpg_key_verify"}} + {{$.i18n.Tr "settings.gpg_key_verify"}} {{end}}
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 9d8ebab60..747b0c171 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -3,9 +3,9 @@ {{.i18n.Tr "settings.manage_ssh_principals"}}
{{if not .DisableSSH}} -
{{.i18n.Tr "settings.add_new_principal"}}
+
{{.i18n.Tr "settings.add_new_principal"}}
{{else}} -
{{.i18n.Tr "settings.ssh_disabled"}}
+
{{.i18n.Tr "settings.ssh_disabled"}}
{{end}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 5051780ef..077e40e01 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -2,11 +2,11 @@ {{.i18n.Tr "settings.manage_ssh_keys"}}
{{if not .DisableSSH }} -
+
{{.i18n.Tr "settings.add_key"}}
{{else}} -
{{.i18n.Tr "settings.ssh_disabled"}}
+
{{.i18n.Tr "settings.ssh_disabled"}}
{{end}}
@@ -42,7 +42,7 @@ {{$.i18n.Tr "settings.delete_key"}} {{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}} - {{$.i18n.Tr "settings.ssh_key_verify"}} + {{$.i18n.Tr "settings.ssh_key_verify"}} {{end}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 1689c1b9e..d951af220 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -7,7 +7,7 @@ {{.i18n.Tr "settings.orgs"}} {{if .SignedUser.CanCreateOrganization}}
- {{.i18n.Tr "admin.orgs.new_orga"}} + {{.i18n.Tr "admin.orgs.new_orga"}}
{{end}} @@ -19,7 +19,7 @@
{{$.CsrfTokenHtml}} - +
{{avatar . 28 "mini"}} diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl index 3d6804d9c..7b0f2d473 100644 --- a/templates/user/settings/security/twofa.tmpl +++ b/templates/user/settings/security/twofa.tmpl @@ -8,7 +8,7 @@
{{.CsrfTokenHtml}}

{{.i18n.Tr "settings.regenerate_scratch_token_desc"}}

- +
{{.CsrfTokenHtml}} diff --git a/web_src/js/features/comp/ReactionSelector.js b/web_src/js/features/comp/ReactionSelector.js index f3b7a7668..272ea45cd 100644 --- a/web_src/js/features/comp/ReactionSelector.js +++ b/web_src/js/features/comp/ReactionSelector.js @@ -16,7 +16,7 @@ export function initCompReactionSelector(parent) { if ($(this).hasClass('disabled')) return; const actionURL = $(this).hasClass('item') ? $(this).closest('.select-reaction').data('action-url') : $(this).data('action-url'); - const url = `${actionURL}/${$(this).hasClass('blue') ? 'unreact' : 'react'}`; + const url = `${actionURL}/${$(this).hasClass('primary') ? 'unreact' : 'react'}`; $.ajax({ type: 'POST', url, diff --git a/web_src/js/features/repo-home.js b/web_src/js/features/repo-home.js index 2a66dbc6f..f0ea18dd1 100644 --- a/web_src/js/features/repo-home.js +++ b/web_src/js/features/repo-home.js @@ -84,8 +84,6 @@ export function initRepoTopicBar() { transition: 'horizontal flip', duration: 200, variation: false, - blue: true, - basic: true, }, className: { label: 'ui small label' diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 5584a6c35..4aff590de 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -71,8 +71,23 @@ --color-pink: #e03997; --color-brown: #a5673f; --color-grey: #888888; - --color-black: #1b1c1d; --color-gold: #a1882b; + /* light variants - produced via Sass scale-color(color, $lightness: +25%) */ + --color-red-light: #e45e5e; + --color-orange-light: #f59555; + --color-yellow-light: #fcce46; + --color-olive-light: #d3e942; + --color-green-light: #46de6a; + --color-teal-light: #08fff4; + --color-blue-light: #51a5e3; + --color-violet-light: #8b67d7; + --color-purple-light: #bb64d8; + --color-pink-light: #e86bb1; + --color-brown-light: #c58b66; + --color-grey-light: #a6a6a6; + --color-gold-light: #cfb34a; + /* other colors */ + --color-black: #1b1c1d; --color-white: #ffffff; --color-diff-removed-word-bg: #fdb8c0; --color-diff-added-word-bg: #acf2bd; @@ -887,19 +902,19 @@ a.ui.card:hover, color: inherit !important; &:hover { - color: #e67777 !important; + color: var(--color-red-light) !important; } } } &.blue { - color: var(--color-primary) !important; + color: var(--color-blue) !important; a { color: inherit !important; &:hover { - color: var(--color-primary-dark-1) !important; + color: var(--color-blue-light) !important; } } } @@ -1078,11 +1093,11 @@ a.ui.card:hover, } &.blue { - background-color: var(--color-primary) !important; + background-color: var(--color-blue) !important; } &.black { - background-color: #444444; + background-color: var(--color-black) !important; } &.grey { @@ -1133,11 +1148,11 @@ a.ui.card:hover, } &.blue { - border-color: var(--color-primary) !important; + border-color: var(--color-blue) !important; } &.black { - border-color: #444444; + border-color: var(--color-black) !important; } &.grey { @@ -1748,59 +1763,55 @@ a.ui.label:hover { background: var(--color-hover); } -.ui.blue.button, -.ui.blue.buttons .button, .ui.primary.button, .ui.primary.buttons .button { background-color: var(--color-primary) !important; } -.ui.blue.button:hover, -.ui.blue.buttons .button:hover, .ui.primary.button:hover, .ui.primary.buttons .button:hover { background-color: var(--color-primary-dark-2) !important; } -.ui.blue.button:focus, -.ui.blue.buttons .button:focus, .ui.primary.button:focus, .ui.primary.buttons .button:focus { background-color: var(--color-primary-dark-3) !important; } -.ui.basic.blue.button, -.ui.basic.blue.buttons .button, .ui.basic.primary.button, .ui.basic.primary.buttons .button { box-shadow: inset 0 0 0 1px var(--color-primary) !important; color: #fff !important; } -.ui.basic.blue.button:hover, -.ui.basic.blue.buttons .button:hover, .ui.basic.primary.button:hover, .ui.basic.primary.buttons .button:hover { box-shadow: inset 0 0 0 1px var(--color-primary-dark-2) !important; } -.ui.basic.blue.button:focus, -.ui.basic.blue.buttons .button:focus, .ui.basic.primary.button:focus, .ui.basic.primary.buttons .button:focus { box-shadow: inset 0 0 0 1px var(--color-primary-dark-3) !important; } -.ui.blue.label, -.ui.blue.labels .label, +.ui.basic.secondary.buttons .button, +.ui.basic.secondary.button { + color: var(--color-secondary-dark-6) !important; +} + +.ui.basic.secondary.buttons .button:hover, +.ui.basic.secondary.button:hover, +.ui.basic.secondary.buttons .button:active, +.ui.basic.secondary.button:active { + color: var(--color-secondary-dark-8) !important; +} + .ui.primary.label, .ui.primary.labels .label { background-color: var(--color-primary) !important; border-color: var(--color-primary-dark-2) !important; } -.ui.basic.labels .blue.label, -.ui.ui.ui.basic.blue.label, .ui.basic.labels .primary.label, .ui.ui.ui.basic.primary.label { background: transparent !important; diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index f8a23e071..f6f86e326 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -301,7 +301,7 @@ font-weight: normal; } - .ui.tiny.blue.buttons { + .ui.tiny.primary.buttons { @media @mediaSm { width: 100%; } @@ -1168,7 +1168,7 @@ border-color: var(--color-secondary-dark-1) !important; } - .ui.label.basic.blue { + .ui.label.basic.primary { background-color: var(--color-reaction-active-bg) !important; border-color: var(--color-primary-alpha-80) !important; } @@ -2411,7 +2411,7 @@ color: var(--color-primary) !important; } - .ui.label.basic.blue { + .ui.label.basic.primary { background-color: var(--color-reaction-active-bg) !important; border-color: var(--color-secondary) !important; }