From 83106c166d8708f6ce5fd5c65ce4a4ad6943c48d Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 21 Oct 2020 23:07:33 +0200
Subject: [PATCH] Replace footer and modal icons with SVG (#13245)
- Replace two font icons with SVG in the footer
- Replace icons in delete modals with SVG
- Horizontally center message text in modals
---
templates/admin/auth/edit.tmpl | 2 +-
templates/admin/repo/list.tmpl | 2 +-
templates/admin/user/edit.tmpl | 2 +-
templates/base/delete_modal_actions.tmpl | 4 ++--
templates/base/footer_content.tmpl | 4 ++--
templates/org/settings/delete.tmpl | 2 +-
templates/org/team/new.tmpl | 2 +-
templates/org/team/repositories.tmpl | 2 +-
templates/repo/branch/list.tmpl | 2 +-
.../repo/issue/labels/edit_delete_label.tmpl | 2 +-
templates/repo/issue/milestones.tmpl | 2 +-
templates/repo/issue/view_content.tmpl | 2 +-
templates/repo/issue/view_content/sidebar.tmpl | 2 +-
templates/repo/projects/list.tmpl | 2 +-
templates/repo/release/new.tmpl | 2 +-
templates/repo/settings/collaboration.tmpl | 2 +-
templates/repo/settings/deploy_keys.tmpl | 2 +-
.../repo/settings/webhook/delete_modal.tmpl | 2 +-
templates/repo/wiki/view.tmpl | 2 +-
templates/user/settings/account.tmpl | 4 ++--
templates/user/settings/applications.tmpl | 2 +-
.../user/settings/applications_oauth2.tmpl | 2 +-
.../user/settings/applications_oauth2_edit.tmpl | 2 +-
templates/user/settings/keys_gpg.tmpl | 2 +-
templates/user/settings/keys_principal.tmpl | 2 +-
templates/user/settings/keys_ssh.tmpl | 2 +-
templates/user/settings/repos.tmpl | 2 +-
.../user/settings/security_accountlinks.tmpl | 2 +-
templates/user/settings/security_openid.tmpl | 2 +-
templates/user/settings/security_twofa.tmpl | 2 +-
templates/user/settings/security_u2f.tmpl | 2 +-
web_src/less/_base.less | 17 +++++++++++++++++
32 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index e6c5cf2578..e182bbc858 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -333,7 +333,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "admin.auths.delete_auth_title"}}
</div>
<div class="content">
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 51e329e038..df38831b6d 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -72,7 +72,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.settings.delete"}}
</div>
<div class="content">
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 95323a97b2..66f3c96711 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -123,7 +123,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.delete_account_title"}}
</div>
<div class="content">
diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index a889c67e5a..7a0760b125 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -1,10 +1,10 @@
<div class="actions">
<div class="ui red basic inverted cancel button">
- <i class="remove icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
- <i class="checkmark icon"></i>
+ {{svg "octicon-check"}}
{{.i18n.Tr "modal.yes"}}
</div>
</div>
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index ddd4f23649..f0d8a6f5a4 100644
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -5,10 +5,10 @@
</div>
<div class="ui right links">
{{if .ShowFooterBranding}}
- <a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea"><i class="fa fa-github-square"></i><span class="sr-only">GitHub</span></a>
+ <a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea">{{svg "octicon-mark-github"}}<span class="sr-only">GitHub</span></a>
{{end}}
<div class="ui language bottom floating slide up dropdown link item">
- <i class="world icon"></i>
+ {{svg "octicon-globe"}}
<div class="text">{{.LangName}}</div>
<div class="menu language-menu">
{{range .AllLangs}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 54d60f93f0..a8d42b5476 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -32,7 +32,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "org.settings.delete_org_title"}}
</div>
<div class="content">
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 228f86824a..eeb9b1186a 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -116,7 +116,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "org.teams.delete_team_title"}}
</div>
<div class="content">
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index de39fee2ea..16418b474d 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -66,7 +66,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "org.teams.remove_all_repos_title"}}
</div>
<div class="content">
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 51ddf6c1e1..4f184397d3 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -131,7 +131,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.branch.delete_html"}} <span class="name"></span>
</div>
<div class="content">
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 4ffa20ef17..54ef584224 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -1,6 +1,6 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.issues.label_deletion"}}
</div>
<div class="content">
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index bb42a9c73d..bc88d1015f 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -95,7 +95,7 @@
{{if or .CanWriteIssues .CanWritePulls}}
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.milestones.deletion"}}
</div>
<div class="content">
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 190f5117b8..0ddea16816 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -219,7 +219,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.branch.delete" .HeadTarget }}
</div>
<div class="content">
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 8a89f2b20c..3a1fcf3e8b 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -611,7 +611,7 @@
<div class="ui basic modal remove-dependency">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.issues.dependency.remove_header"}}
</div>
<div class="content">
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 7151442689..3974cd3dd1 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -78,7 +78,7 @@
{{if or .CanWriteIssues .CanWritePulls}}
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.projects.deletion"}}
</div>
<div class="content">
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 8d94970bf6..963d0dcde7 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -99,7 +99,7 @@
{{if .PageIsEditRelease}}
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.release.deletion"}}
</div>
<div class="content">
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 9061857041..13030fe86a 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -114,7 +114,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.settings.collaborator_deletion"}}
</div>
<div class="content">
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 15d861d74e..d6fb87bb83 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -82,7 +82,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.settings.deploy_key_deletion"}}
</div>
<div class="content">
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index 2a2a7c8da2..f775228ce0 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -1,6 +1,6 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.settings.webhook_deletion"}}
</div>
<div class="content">
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 3d29cdcc56..7252093fb6 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -101,7 +101,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.wiki.delete_page_button"}}
</div>
<div class="content">
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 113e03cd9b..1a978a6c28 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -194,7 +194,7 @@
<div class="ui small basic delete modal" id="delete-email">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.email_deletion"}}
</div>
<div class="content">
@@ -205,7 +205,7 @@
<div class="ui small basic delete modal" id="delete-account">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.delete_account_title"}}
</div>
<div class="content">
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index b2751ae13b..56f78d8e62 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -55,7 +55,7 @@
<div class="ui small basic delete modal" id="delete-token">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.access_token_deletion"}}
</div>
<div class="content">
diff --git a/templates/user/settings/applications_oauth2.tmpl b/templates/user/settings/applications_oauth2.tmpl
index 42d1950f9f..65b9da4950 100644
--- a/templates/user/settings/applications_oauth2.tmpl
+++ b/templates/user/settings/applications_oauth2.tmpl
@@ -48,7 +48,7 @@
<div class="ui small basic delete modal" id="remove-gitea-oauth2-application">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.remove_oauth2_application"}}
</div>
<div class="content">
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index c978ad5c2c..495f8ec168 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -57,7 +57,7 @@
<div class="ui small basic delete modal" id="delete-oauth2-application">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.remove_oauth2_application"}}
</div>
<div class="content">
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 5cde1d214d..91658a15ee 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -59,7 +59,7 @@
<div class="ui small basic delete modal" id="delete-gpg">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.gpg_key_deletion"}}
</div>
<div class="content">
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index c163263ea9..26204b5b98 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -56,7 +56,7 @@
<div class="ui small basic delete modal" id="delete-principal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.ssh_principal_deletion"}}
</div>
<div class="content">
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 3d41f33595..9a4db09c2d 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -63,7 +63,7 @@
<div class="ui small basic delete modal" id="delete-ssh">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.ssh_key_deletion"}}
</div>
<div class="content">
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 456647d9be..a9d029a2b8 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -142,7 +142,7 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.remove_account_link"}}
</div>
<div class="content">
diff --git a/templates/user/settings/security_accountlinks.tmpl b/templates/user/settings/security_accountlinks.tmpl
index 057a0f9aff..ba3962836c 100644
--- a/templates/user/settings/security_accountlinks.tmpl
+++ b/templates/user/settings/security_accountlinks.tmpl
@@ -26,7 +26,7 @@
<div class="ui small basic delete modal" id="delete-account-link">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.remove_account_link"}}
</div>
<div class="content">
diff --git a/templates/user/settings/security_openid.tmpl b/templates/user/settings/security_openid.tmpl
index a16501acfa..72442d45e1 100644
--- a/templates/user/settings/security_openid.tmpl
+++ b/templates/user/settings/security_openid.tmpl
@@ -53,7 +53,7 @@
<div class="ui small basic delete modal" id="delete-openid">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.openid_deletion"}}
</div>
<div class="content">
diff --git a/templates/user/settings/security_twofa.tmpl b/templates/user/settings/security_twofa.tmpl
index 138872d317..c877aebc32 100644
--- a/templates/user/settings/security_twofa.tmpl
+++ b/templates/user/settings/security_twofa.tmpl
@@ -25,7 +25,7 @@
<div class="ui small basic delete modal" id="disable-twofa">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.twofa_disable"}}
</div>
<div class="content">
diff --git a/templates/user/settings/security_u2f.tmpl b/templates/user/settings/security_u2f.tmpl
index 5fb5f344d1..41bec78b70 100644
--- a/templates/user/settings/security_u2f.tmpl
+++ b/templates/user/settings/security_u2f.tmpl
@@ -45,7 +45,7 @@
<div class="ui small basic delete modal" id="delete-registration">
<div class="ui icon header">
- <i class="trash icon"></i>
+ {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.u2f_delete_key"}}
</div>
<div class="content">
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 81111d82fa..fdaa3c1814 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -679,6 +679,23 @@ code,
}
}
}
+
+ /* modal svg icons, copied from fomantic except width and height */
+ &.icon.header svg {
+ width: 3em;
+ height: 3em;
+ float: none;
+ display: block;
+ line-height: 1;
+ padding: 0;
+ margin: 0 auto .5rem;
+ opacity: 1;
+ }
+
+ /* center text in fomantic modal dialogs */
+ &.modal > .content {
+ text-align: center;
+ }
}
.file-comment {