diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 137c42b45d..ea2e026fcf 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -54,7 +54,7 @@ {{if and DefaultShowFullName .FullName}}{{.FullName}} ({{.Name}}){{else}}{{.Name}}{{end}} {{if .Visibility.IsPrivate}} - {{svg "octicon-lock"}} + {{svg "octicon-lock"}} {{end}} {{if eq .Type 3}}{{/* Reserved organization */}} {{ctx.Locale.Tr "admin.users.reserved"}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 4817f2681b..83b07bcdef 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -58,7 +58,7 @@ {{.Owner.Name}} {{if .Owner.Visibility.IsPrivate}} - {{svg "octicon-lock"}} + {{svg "octicon-lock"}} {{end}} {{.Package.Type.Name}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 767d00fa74..07e0c9b426 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -49,7 +49,7 @@ {{.Owner.Name}} {{if .Owner.Visibility.IsPrivate}} - {{svg "octicon-lock"}} + {{svg "octicon-lock"}} {{end}} diff --git a/templates/repo/icon.tmpl b/templates/repo/icon.tmpl index e4a904c46b..5ee7c08ade 100644 --- a/templates/repo/icon.tmpl +++ b/templates/repo/icon.tmpl @@ -5,6 +5,8 @@ {{svg "octicon-mirror" 24}} {{else if $.IsFork}} {{svg "octicon-repo-forked" 24}} +{{else if $.IsPrivate}} + {{svg "octicon-repo-locked" 24}} {{else}} {{svg "octicon-repo" 24}} {{end}} diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index cbafee9ba9..a33b76f321 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -59,11 +59,11 @@
{{if .Permission.CanRead ctx.Consts.RepoUnitTypePullRequests}} - {{svg "octicon-git-pull-request"}} {{.Activity.MergedPRCount}}
+ {{svg "octicon-git-merge"}} {{.Activity.MergedPRCount}}
{{ctx.Locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}} - {{svg "octicon-git-branch"}} {{.Activity.OpenedPRCount}}
+ {{svg "octicon-git-pull-request"}} {{.Activity.OpenedPRCount}}
{{ctx.Locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}} {{end}} diff --git a/templates/shared/repo/list.tmpl b/templates/shared/repo/list.tmpl index 2c8af14f9c..ef7d7a540d 100644 --- a/templates/shared/repo/list.tmpl +++ b/templates/shared/repo/list.tmpl @@ -48,7 +48,7 @@ {{end}} - {{svg "octicon-git-branch" 16}} + {{svg "octicon-repo-forked" 16}} {{CountFmt .NumForks}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 4aed8070de..cd1c9d8e25 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -13,7 +13,7 @@
{{if $repo}} {{if $repo.IsPrivate}} - {{svg "octicon-lock"}} + {{svg "octicon-repo-locked"}} {{else if $repo.IsFork}} {{svg "octicon-repo-forked"}} {{else if $repo.IsMirror}} @@ -86,7 +86,7 @@
{{if .IsPrivate}} - {{svg "octicon-lock" 16 "text gold"}} + {{svg "octicon-lock"}} {{else if .IsFork}} {{svg "octicon-repo-forked"}} {{else if .IsMirror}} diff --git a/web_src/css/base.css b/web_src/css/base.css index be28cd6fea..20e0b5d59d 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -584,10 +584,6 @@ img.ui.avatar, color: var(--color-grey-light) !important; } -.text.gold { - color: var(--color-gold) !important; -} - .text.small { font-size: 0.75em; } diff --git a/web_src/css/themes/theme-gitea-dark.css b/web_src/css/themes/theme-gitea-dark.css index 1718a1f06b..37ff3b2d98 100644 --- a/web_src/css/themes/theme-gitea-dark.css +++ b/web_src/css/themes/theme-gitea-dark.css @@ -146,7 +146,6 @@ gitea-theme-meta-info { /* other colors */ --color-grey: #384149; --color-grey-light: #818f9e; - --color-gold: #b1983b; --color-white: #ffffff; --color-diff-added-linenum-bg: #274227; --color-diff-added-row-bg: #203224; diff --git a/web_src/css/themes/theme-gitea-light.css b/web_src/css/themes/theme-gitea-light.css index db54f5e5fb..2798d76583 100644 --- a/web_src/css/themes/theme-gitea-light.css +++ b/web_src/css/themes/theme-gitea-light.css @@ -146,7 +146,6 @@ gitea-theme-meta-info { /* other colors */ --color-grey: #697077; --color-grey-light: #7c838a; - --color-gold: #a1882b; --color-white: #ffffff; --color-diff-added-linenum-bg: #d1f8d9; --color-diff-added-row-bg: #e6ffed; diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index e938814ec6..5d0d66e4b3 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -291,7 +291,7 @@ export default defineComponent({ } else if (repo.template) { return `octicon-repo-template`; } else if (repo.private) { - return 'octicon-lock'; + return 'octicon-repo-locked'; } else if (repo.internal) { return 'octicon-repo'; } @@ -391,7 +391,7 @@ export default defineComponent({
diff --git a/web_src/js/svg.ts b/web_src/js/svg.ts index 3d3e653072..b1953b0446 100644 --- a/web_src/js/svg.ts +++ b/web_src/js/svg.ts @@ -63,6 +63,7 @@ import octiconProject from '../../public/assets/img/svg/octicon-project.svg'; import octiconQuote from '../../public/assets/img/svg/octicon-quote.svg'; import octiconRepo from '../../public/assets/img/svg/octicon-repo.svg'; import octiconRepoForked from '../../public/assets/img/svg/octicon-repo-forked.svg'; +import octiconRepoLocked from '../../public/assets/img/svg/octicon-repo-locked.svg'; import octiconRepoTemplate from '../../public/assets/img/svg/octicon-repo-template.svg'; import octiconRss from '../../public/assets/img/svg/octicon-rss.svg'; import octiconScreenFull from '../../public/assets/img/svg/octicon-screen-full.svg'; @@ -144,6 +145,7 @@ const svgs = { 'octicon-quote': octiconQuote, 'octicon-repo': octiconRepo, 'octicon-repo-forked': octiconRepoForked, + 'octicon-repo-locked': octiconRepoLocked, 'octicon-repo-template': octiconRepoTemplate, 'octicon-rss': octiconRss, 'octicon-screen-full': octiconScreenFull,