From 83106c166d8708f6ce5fd5c65ce4a4ad6943c48d Mon Sep 17 00:00:00 2001 From: silverwind 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 e6c5cf25783..e182bbc8581 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -333,7 +333,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "admin.auths.delete_auth_title"}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 51e329e0383..df38831b6da 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -72,7 +72,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.settings.delete"}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 95323a97b21..66f3c967112 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -123,7 +123,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "settings.delete_account_title"}}
diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl index a889c67e5ac..7a0760b1258 100644 --- a/templates/base/delete_modal_actions.tmpl +++ b/templates/base/delete_modal_actions.tmpl @@ -1,10 +1,10 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "modal.no"}}
- + {{svg "octicon-check"}} {{.i18n.Tr "modal.yes"}}
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index ddd4f236498..f0d8a6f5a45 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -5,10 +5,10 @@
{{if .ShowFooterBranding}} - GitHub + {{svg "octicon-mark-github"}}GitHub {{end}}
- + {{svg "octicon-globe"}}
{{.LangName}}
{{range .AllLangs}} diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 54d60f93f08..a8d42b5476e 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -32,7 +32,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "org.settings.delete_org_title"}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 228f86824a0..eeb9b1186a6 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -116,7 +116,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "org.teams.delete_team_title"}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index de39fee2ea9..16418b474d4 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -66,7 +66,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "org.teams.remove_all_repos_title"}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 51ddf6c1e1b..4f184397d30 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -131,7 +131,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.branch.delete_html"}}
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index 4ffa20ef174..54ef5842242 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -1,6 +1,6 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.issues.label_deletion"}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index bb42a9c73d9..bc88d1015f1 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -95,7 +95,7 @@ {{if or .CanWriteIssues .CanWritePulls}}
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.milestones.deletion"}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 190f5117b85..0ddea168164 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -219,7 +219,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.branch.delete" .HeadTarget }}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 8a89f2b20c0..3a1fcf3e8b3 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -611,7 +611,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.issues.dependency.remove_header"}}
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 7151442689e..3974cd3dd17 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -78,7 +78,7 @@ {{if or .CanWriteIssues .CanWritePulls}}
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.projects.deletion"}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 8d94970bf6e..963d0dcde7c 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -99,7 +99,7 @@ {{if .PageIsEditRelease}}
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.release.deletion"}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 9061857041f..13030fe86a0 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -114,7 +114,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.settings.collaborator_deletion"}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 15d861d74ec..d6fb87bb83a 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -82,7 +82,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.settings.deploy_key_deletion"}}
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl index 2a2a7c8da2f..f775228ce0b 100644 --- a/templates/repo/settings/webhook/delete_modal.tmpl +++ b/templates/repo/settings/webhook/delete_modal.tmpl @@ -1,6 +1,6 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.settings.webhook_deletion"}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 3d29cdcc56e..7252093fb6b 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -101,7 +101,7 @@
- + {{svg "octicon-trashcan"}} {{.i18n.Tr "repo.wiki.delete_page_button"}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 113e03cd9b2..1a978a6c283 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -194,7 +194,7 @@