From bc719f549ee67a141302fca545c44262b9fed332 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 12 May 2023 15:38:59 +0900 Subject: [PATCH] Update pin and add pin-slash (#24669) Continue #23531 Thanks for the update in https://github.com/primer/octicons/issues/940, @CameronFoxly ![image](https://github.com/go-gitea/gitea/assets/18380374/bc512b20-b656-4bd7-8e70-3a2b7eca9d65) ![image](https://github.com/go-gitea/gitea/assets/18380374/a3863267-6a7a-48d5-8157-9f361fec3fed) --- package-lock.json | 8 ++++---- package.json | 2 +- public/img/svg/octicon-devices.svg | 1 + public/img/svg/octicon-move-to-top.svg | 2 +- public/img/svg/octicon-pin-slash.svg | 1 + public/img/svg/octicon-pin.svg | 2 +- templates/projects/view.tmpl | 2 +- templates/repo/projects/view.tmpl | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 public/img/svg/octicon-devices.svg create mode 100644 public/img/svg/octicon-pin-slash.svg diff --git a/package-lock.json b/package-lock.json index 93c5775e00..73468344d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@github/relative-time-element": "4.3.0", "@github/text-expander-element": "2.3.0", "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", - "@primer/octicons": "18.3.0", + "@primer/octicons": "19.1.0", "@vue/compiler-sfc": "3.2.47", "@webcomponents/custom-elements": "1.6.0", "add-asset-webpack-plugin": "2.0.1", @@ -1174,9 +1174,9 @@ } }, "node_modules/@primer/octicons": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-18.3.0.tgz", - "integrity": "sha512-vyUej5rKjXfqHAmYSo2k3pA9IsL5KJaYOBVXvc188FwBfUweA+WVP3qwWyZTSQnp9LK6yOajGyr0SCMIa9ombw==", + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-19.1.0.tgz", + "integrity": "sha512-5o90F89gNPnAk1qfzl3hb/TcsUjk5g0WFI+fBRHLkBKzB3uc9EvxTpgzjXhhjyriOkrBOjFo58D0sjtwttaQww==", "dependencies": { "object-assign": "^4.1.1" } diff --git a/package.json b/package.json index 9d9c0923ef..fe637e9389 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@github/relative-time-element": "4.3.0", "@github/text-expander-element": "2.3.0", "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", - "@primer/octicons": "18.3.0", + "@primer/octicons": "19.1.0", "@vue/compiler-sfc": "3.2.47", "@webcomponents/custom-elements": "1.6.0", "add-asset-webpack-plugin": "2.0.1", diff --git a/public/img/svg/octicon-devices.svg b/public/img/svg/octicon-devices.svg new file mode 100644 index 0000000000..c351640dea --- /dev/null +++ b/public/img/svg/octicon-devices.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/svg/octicon-move-to-top.svg b/public/img/svg/octicon-move-to-top.svg index 78498db364..f0726dd988 100644 --- a/public/img/svg/octicon-move-to-top.svg +++ b/public/img/svg/octicon-move-to-top.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/public/img/svg/octicon-pin-slash.svg b/public/img/svg/octicon-pin-slash.svg new file mode 100644 index 0000000000..4ba1d4a5e2 --- /dev/null +++ b/public/img/svg/octicon-pin-slash.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/svg/octicon-pin.svg b/public/img/svg/octicon-pin.svg index f41a4a3580..e24d9cc817 100644 --- a/public/img/svg/octicon-pin.svg +++ b/public/img/svg/octicon-pin.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 3274463435..014a748317 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -109,7 +109,7 @@ data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}" data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}" data-url="{{$.Link}}/{{.ID}}/unsetdefault"> - {{svg "octicon-pin"}} + {{svg "octicon-pin-slash"}} {{$.locale.Tr "repo.projects.column.unset_default"}} {{end}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 4c4f82c8e7..73548701d4 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -115,7 +115,7 @@ data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}" data-type="unset_default" data-url="{{$.Link}}/{{.ID}}/unsetdefault"> - {{svg "octicon-pin"}} + {{svg "octicon-pin-slash"}} {{$.locale.Tr "repo.projects.column.unset_default"}} {{end}}