Misc icon tweaks

templates/admin/org/list.tmpl

@@ -54,7 +54,7 @@
 							<td>
 								<a href="{{.HomeLink}}">{{if and DefaultShowFullName .FullName}}{{.FullName}} ({{.Name}}){{else}}{{.Name}}{{end}}</a>
 								{{if .Visibility.IsPrivate}}
-									<span class="text gold">{{svg "octicon-lock"}}</span>
+									{{svg "octicon-lock"}}
 								{{end}}
 								{{if eq .Type 3}}{{/* Reserved organization */}}
 									<span class="ui mini label">{{ctx.Locale.Tr "admin.users.reserved"}}</span>

templates/admin/packages/list.tmpl

@@ -58,7 +58,7 @@
 							<td>
 								<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
 								{{if .Owner.Visibility.IsPrivate}}
-									<span class="text gold">{{svg "octicon-lock"}}</span>
+									{{svg "octicon-lock"}}
 								{{end}}
 							</td>
 							<td>{{.Package.Type.Name}}</td>

templates/admin/repo/list.tmpl

@@ -49,7 +49,7 @@
 							<td>
 								<a class="tw-break-anywhere" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
 								{{if .Owner.Visibility.IsPrivate}}
-									<span class="text gold">{{svg "octicon-lock"}}</span>
+									{{svg "octicon-lock"}}
 								{{end}}
 							</td>
 							<td>

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}}

templates/repo/pulse.tmpl

@@ -59,11 +59,11 @@
 <div class="ui attached segment horizontal segments">
 	{{if .Permission.CanRead ctx.Consts.RepoUnitTypePullRequests}}
 		<a href="#merged-pull-requests" class="ui attached segment text center">
-			<span class="text purple">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br>
+			<span class="text purple">{{svg "octicon-git-merge"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br>
 			{{ctx.Locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}}
 		</a>
 		<a href="#proposed-pull-requests" class="ui attached segment text center">
-			<span class="text green">{{svg "octicon-git-branch"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br>
+			<span class="text green">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br>
 			{{ctx.Locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}}
 		</a>
 	{{end}}

templates/shared/repo/list.tmpl

@@ -48,7 +48,7 @@
 							</a>
 						{{end}}
 						<a class="flex-text-inline" href="{{.Link}}/forks">
-							<span class="tw-contents" aria-label="{{ctx.Locale.Tr "repo.forks"}}">{{svg "octicon-git-branch" 16}}</span>
+							<span class="tw-contents" aria-label="{{ctx.Locale.Tr "repo.forks"}}">{{svg "octicon-repo-forked" 16}}</span>
 							<span {{if ge .NumForks 1000}}data-tooltip-content="{{.NumForks}}"{{end}}>{{CountFmt .NumForks}}</span>
 						</a>
 					</div>

templates/user/settings/repos.tmpl

@@ -13,7 +13,7 @@
 								<div class="content">
 									{{if $repo}}
 										{{if $repo.IsPrivate}}
-											<span class="text gold icon">{{svg "octicon-lock"}}</span>
+											<span class="icon">{{svg "octicon-repo-locked"}}</span>
 										{{else if $repo.IsFork}}
 											<span class="icon">{{svg "octicon-repo-forked"}}</span>
 										{{else if $repo.IsMirror}}
@@ -86,7 +86,7 @@
 							<div class="item">
 								<div class="content flex-text-block">
 									{{if .IsPrivate}}
-										{{svg "octicon-lock" 16 "text gold"}}
+										{{svg "octicon-lock"}}
 									{{else if .IsFork}}
 										{{svg "octicon-repo-forked"}}
 									{{else if .IsMirror}}

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;
 }

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;

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;

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({
                 <div class="ui checkbox" ref="checkboxPrivateFilter" :title="checkboxPrivateFilterTitle">
                   <input type="checkbox" class="tw-pointer-events-none" v-bind.prop="checkboxPrivateFilterProps">
                   <label>
-                    <svg-icon name="octicon-lock" :size="16" class="tw-mr-1"/>
+                    <svg-icon name="octicon-repo-locked" :size="16" class="tw-mr-1"/>
                     {{ textShowPrivate }}
                   </label>
                 </div>

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,