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 @@ <a class="text primary name" href="{{.Link}}">{{.Name}}</a> <span class="label-list"> {{if .IsArchived}} - <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span> + <span class="ui label">{{ctx.Locale.Tr "repo.desc.archived"}}</span> {{end}} {{if .IsPrivate}} - <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span> + <span class="ui label">{{ctx.Locale.Tr "repo.desc.private"}}</span> {{else}} {{if .Owner.Visibility.IsPrivate}} - <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span> + <span class="ui label">{{ctx.Locale.Tr "repo.desc.internal"}}</span> {{end}} {{end}} {{if .IsTemplate}} - <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span> + <span class="ui label">{{ctx.Locale.Tr "repo.desc.template"}}</span> {{end}} {{if eq .ObjectFormatName "sha256"}} - <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.sha256"}}</span> + <span class="ui label">{{ctx.Locale.Tr "repo.desc.sha256"}}</span> {{end}} </span> </div> 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 @@ <div class="flex-item-title"> {{template "shared/user/name" .}} {{if .Visibility.IsPrivate}} - <span class="ui basic tiny label">{{ctx.Locale.Tr "repo.desc.private"}}</span> + <span class="ui label">{{ctx.Locale.Tr "repo.desc.private"}}</span> {{end}} </div> <div class="flex-item-body"> 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 @@ <div class="org-title"> {{.Org.DisplayName}} <span class="org-visibility"> - {{if .Org.Visibility.IsLimited}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}} - {{if .Org.Visibility.IsPrivate}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</span>{{end}} + {{if .Org.Visibility.IsLimited}}<span class="ui large horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}} + {{if .Org.Visibility.IsPrivate}}<span class="ui large horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</span>{{end}} </span> </div> <span class="tw-flex tw-items-center button-row tw-ml-auto tw-text-16 tw-whitespace-nowrap"> 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 @@ <div class="flex-item-title"> {{template "shared/user/name" .}} {{if not $isPublic}} - <span class="ui basic tiny label">{{ctx.Locale.Tr "org.members.private"}}</span> + <span class="ui label">{{ctx.Locale.Tr "org.members.private"}}</span> {{end}} </div> {{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 @@ </div> <div class="flex-item-trailing"> {{if .IsArchived}} - <span class="ui basic label not-mobile">{{ctx.Locale.Tr "repo.desc.archived"}}</span> + <span class="ui label not-mobile">{{ctx.Locale.Tr "repo.desc.archived"}}</span> <div class="repo-icon only-mobile" data-tooltip-content="{{ctx.Locale.Tr "repo.desc.archived"}}">{{svg "octicon-archive" 18}}</div> {{end}} {{if .IsPrivate}} - <span class="ui basic label not-mobile">{{ctx.Locale.Tr "repo.desc.private"}}</span> + <span class="ui label not-mobile">{{ctx.Locale.Tr "repo.desc.private"}}</span> <div class="repo-icon only-mobile" data-tooltip-content="{{ctx.Locale.Tr "repo.desc.private"}}">{{svg "octicon-lock" 18}}</div> {{else}} {{if .Owner.Visibility.IsPrivate}} - <span class="ui basic label not-mobile">{{ctx.Locale.Tr "repo.desc.internal"}}</span> + <span class="ui label not-mobile">{{ctx.Locale.Tr "repo.desc.internal"}}</span> <div class="repo-icon only-mobile" data-tooltip-content="{{ctx.Locale.Tr "repo.desc.internal"}}">{{svg "octicon-shield-lock" 18}}</div> {{end}} {{end}} {{if .IsTemplate}} - <span class="ui basic label not-mobile">{{ctx.Locale.Tr "repo.desc.template"}}</span> + <span class="ui label not-mobile">{{ctx.Locale.Tr "repo.desc.template"}}</span> <div class="repo-icon only-mobile" data-tooltip-content="{{ctx.Locale.Tr "repo.desc.template"}}">{{svg "octicon-repo-template" 18}}</div> {{end}} {{if eq .ObjectFormatName "sha256"}} - <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.sha256"}}</span> + <span class="ui label">{{ctx.Locale.Tr "repo.desc.sha256"}}</span> {{end}} </div> </div> 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}} <span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span> <span class="org-visibility"> - {{if .ContextUser.Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} - {{if .ContextUser.Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} + {{if .ContextUser.Visibility.IsLimited}}<div class="ui horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} + {{if .ContextUser.Visibility.IsPrivate}}<div class="ui horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} </span> {{svg "octicon-triangle-down" 14 "dropdown icon"}} </span> @@ -20,8 +20,8 @@ {{ctx.AvatarUtils.Avatar .SignedUser}} <span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span> <span class="org-visibility"> - {{if .SignedUser.Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} - {{if .SignedUser.Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} + {{if .SignedUser.Visibility.IsLimited}}<div class="ui horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} + {{if .SignedUser.Visibility.IsPrivate}}<div class="ui horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} </span> </a> {{range .Orgs}} @@ -29,8 +29,8 @@ {{ctx.AvatarUtils.Avatar .}} <span class="truncated-item-name">{{.ShortName 40}}</span> <span class="org-visibility"> - {{if .Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} - {{if .Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} + {{if .Visibility.IsLimited}}<div class="ui horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} + {{if .Visibility.IsPrivate}}<div class="ui horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} </span> </a> {{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;