Embed Matrix icon as SVG (#21890)

Embed the SVG icon directly, making further invertion unnecessary because the icon color can now follow text color. <img width="240" alt="Screenshot 2022-11-21 at 20 16 32" src="https://user-images.githubusercontent.com/115237/203142189-89f20de9-c0bd-4d05-92c0-44dadf20d78f.png"> <img width="245" alt="Screenshot 2022-11-21 at 20 16 46" src="https://user-images.githubusercontent.com/115237/203142191-658239ba-1859-49c6-91ad-10ddf14780d0.png">
go-gitea · Nov 21, 2022 · 2e5ac53 · 2e5ac53
1 parent 2836382
commit 2e5ac53
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/public/img/svg/gitea-matrix.svg b/public/img/svg/gitea-matrix.svg
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
@@ -31,7 +31,7 @@
 				{{else if eq .HookType "feishu"}}
 					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
 				{{else if eq .HookType "matrix"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
+					{{svg "gitea-matrix" 26}}
 				{{else if eq .HookType "wechatwork"}}
 					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
 				{{else if eq .HookType "packagist"}}

diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
@@ -26,7 +26,7 @@
 						{{else if eq .HookType "feishu"}}
 							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
 						{{else if eq .HookType "matrix"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
+							{{svg "gitea-matrix" 26}}
 						{{else if eq .HookType "wechatwork"}}
 							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
 						{{else if eq .HookType "packagist"}}

diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl
@@ -29,7 +29,7 @@
 					<img width="20" height="20" src="{{AssetUrlPrefix}}/img/feishu.png">{{.locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}}
 				</a>
 				<a class="item" href="{{.BaseLinkNew}}/matrix/new">
-					<img width="20" height="20" src="{{AssetUrlPrefix}}/img/matrix.svg">{{.locale.Tr "repo.settings.web_hook_name_matrix"}}
+					{{svg "gitea-matrix" 20 "img"}}{{.locale.Tr "repo.settings.web_hook_name_matrix"}}
 				</a>
 				<a class="item" href="{{.BaseLinkNew}}/wechatwork/new">
 					<img width="20" height="20" src="{{AssetUrlPrefix}}/img/wechatwork.png">{{.locale.Tr "repo.settings.web_hook_name_wechatwork"}}

diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
@@ -24,7 +24,7 @@
 				{{else if eq .HookType "feishu"}}
 					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
 				{{else if eq .HookType "matrix"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
+					{{svg "gitea-matrix" 26}}
 				{{else if eq .HookType "wechatwork"}}
 					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
 				{{else if eq .HookType "packagist"}}

diff --git a/web_src/less/_base.less b/web_src/less/_base.less
@@ -784,6 +784,9 @@ a.commit-statuses-trigger {
   margin-top: -.25rem;
   margin-bottom: -.25rem;
 }
+.ui.dropdown .menu > .item > svg.img {
+  margin-right: .78571429rem;
+}
 
 .ui.selection.dropdown .menu > .item {
   border-color: var(--color-secondary);

diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less
@@ -182,7 +182,3 @@
 .emoji[aria-label="musical notes"] {
   filter: invert(100%) hue-rotate(180deg);
 }
-
-img[src$="/img/matrix.svg"] {
-  filter: invert(80%);
-}
diff --git a/public/img/matrix.svg → web_src/svg/gitea-matrix.svg b/public/img/matrix.svg → web_src/svg/gitea-matrix.svg