diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index f11f2e94ef..ab5999832d 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -13,20 +13,20 @@ {{.Name}} {{if .IsArchived}} - {{ctx.Locale.Tr "repo.desc.archived"}} + {{ctx.Locale.Tr "repo.desc.archived"}} {{end}} {{if .IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private"}} + {{ctx.Locale.Tr "repo.desc.private"}} {{else}} {{if .Owner.Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.internal"}} + {{ctx.Locale.Tr "repo.desc.internal"}} {{end}} {{end}} {{if .IsTemplate}} - {{ctx.Locale.Tr "repo.desc.template"}} + {{ctx.Locale.Tr "repo.desc.template"}} {{end}} {{if eq .ObjectFormatName "sha256"}} - {{ctx.Locale.Tr "repo.desc.sha256"}} + {{ctx.Locale.Tr "repo.desc.sha256"}} {{end}} diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index 4128a489aa..4cfb6c9bf5 100644 --- a/templates/explore/user_list.tmpl +++ b/templates/explore/user_list.tmpl @@ -8,7 +8,7 @@
{{template "shared/user/name" .}} {{if .Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private"}} + {{ctx.Locale.Tr "repo.desc.private"}} {{end}}
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 494dedf67a..4359b819a1 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -5,8 +5,8 @@
{{.Org.DisplayName}} - {{if .Org.Visibility.IsLimited}}{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}{{end}} - {{if .Org.Visibility.IsPrivate}}{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}{{end}} + {{if .Org.Visibility.IsLimited}}{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}{{end}} + {{if .Org.Visibility.IsPrivate}}{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}{{end}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 4388dc9520..dccf588f6a 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -15,7 +15,7 @@
{{template "shared/user/name" .}} {{if not $isPublic}} - {{ctx.Locale.Tr "org.members.private"}} + {{ctx.Locale.Tr "org.members.private"}} {{end}}
{{if not $.PublicOnly}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 2215c27886..5162fd429b 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -13,24 +13,24 @@
{{if .IsArchived}} - {{ctx.Locale.Tr "repo.desc.archived"}} + {{ctx.Locale.Tr "repo.desc.archived"}}
{{svg "octicon-archive" 18}}
{{end}} {{if .IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private"}} + {{ctx.Locale.Tr "repo.desc.private"}}
{{svg "octicon-lock" 18}}
{{else}} {{if .Owner.Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.internal"}} + {{ctx.Locale.Tr "repo.desc.internal"}}
{{svg "octicon-shield-lock" 18}}
{{end}} {{end}} {{if .IsTemplate}} - {{ctx.Locale.Tr "repo.desc.template"}} + {{ctx.Locale.Tr "repo.desc.template"}}
{{svg "octicon-repo-template" 18}}
{{end}} {{if eq .ObjectFormatName "sha256"}} - {{ctx.Locale.Tr "repo.desc.sha256"}} + {{ctx.Locale.Tr "repo.desc.sha256"}} {{end}}
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 1fa356f95d..f1059c75ff 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -6,8 +6,8 @@ {{ctx.AvatarUtils.Avatar .ContextUser}} {{.ContextUser.ShortName 40}} - {{if .ContextUser.Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .ContextUser.Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .ContextUser.Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} + {{if .ContextUser.Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -20,8 +20,8 @@ {{ctx.AvatarUtils.Avatar .SignedUser}} {{.SignedUser.ShortName 40}} - {{if .SignedUser.Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .SignedUser.Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .SignedUser.Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} + {{if .SignedUser.Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}}
{{range .Orgs}} @@ -29,8 +29,8 @@ {{ctx.AvatarUtils.Avatar .}} {{.ShortName 40}} - {{if .Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} + {{if .Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}}
{{end}} diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css index fa89cc2ec8..c86ea53314 100644 --- a/web_src/css/themes/theme-forgejo-light.css +++ b/web_src/css/themes/theme-forgejo-light.css @@ -269,7 +269,7 @@ --color-nav-text: var(--color-text); --color-secondary-nav-bg: var(--color-body); --color-label-text: var(--color-text); - --color-label-bg: #cacaca5b; + --color-label-bg: #cacaca7b; --color-label-hover-bg: #cacacaa0; --color-label-active-bg: #cacacaff; --color-label-bg-alt: #cacacaff;