mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-27 10:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace footer and modal icons with SVG (#13245)

Browse source 
- Replace two font icons with SVG in the footer
- Replace icons in delete modals with SVG
- Horizontally center message text in modals
This commit is contained in:
silverwind 2020-10-21 23:07:33 +02:00 committed by GitHub
parent a06ea38207
commit 83106c166d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 51 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/admin/auth/edit.tmpl
View file

@ -333,7 +333,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "admin.auths.delete_auth_title"}} {{.i18n.Tr "admin.auths.delete_auth_title"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/admin/repo/list.tmpl
View file

@ -72,7 +72,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.settings.delete"}} {{.i18n.Tr "repo.settings.delete"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/admin/user/edit.tmpl
View file

@ -123,7 +123,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.delete_account_title"}} {{.i18n.Tr "settings.delete_account_title"}}
</div> </div>
<div class="content"> <div class="content">

4
templates/base/delete_modal_actions.tmpl
View file

@ -1,10 +1,10 @@
<div class="actions"> <div class="actions">
<div class="ui red basic inverted cancel button"> <div class="ui red basic inverted cancel button">
<i class="remove icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "modal.no"}} {{.i18n.Tr "modal.no"}}
</div> </div>
<div class="ui green basic inverted ok button"> <div class="ui green basic inverted ok button">
<i class="checkmark icon"></i> {{svg "octicon-check"}}
{{.i18n.Tr "modal.yes"}} {{.i18n.Tr "modal.yes"}}
</div> </div>
</div> </div>

4
templates/base/footer_content.tmpl
View file

@ -5,10 +5,10 @@
</div> </div>
<div class="ui right links"> <div class="ui right links">
{{if .ShowFooterBranding}} {{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}} {{end}}
<div class="ui language bottom floating slide up dropdown link item"> <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="text">{{.LangName}}</div>
<div class="menu language-menu"> <div class="menu language-menu">
{{range .AllLangs}} {{range .AllLangs}}

2
templates/org/settings/delete.tmpl
View file

@ -32,7 +32,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "org.settings.delete_org_title"}} {{.i18n.Tr "org.settings.delete_org_title"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/org/team/new.tmpl
View file

@ -116,7 +116,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "org.teams.delete_team_title"}} {{.i18n.Tr "org.teams.delete_team_title"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/org/team/repositories.tmpl
View file

@ -66,7 +66,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "org.teams.remove_all_repos_title"}} {{.i18n.Tr "org.teams.remove_all_repos_title"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/branch/list.tmpl
View file

@ -131,7 +131,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.branch.delete_html"}} <span class="name"></span> {{.i18n.Tr "repo.branch.delete_html"}} <span class="name"></span>
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/issue/labels/edit_delete_label.tmpl
View file

@ -1,6 +1,6 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.issues.label_deletion"}} {{.i18n.Tr "repo.issues.label_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/issue/milestones.tmpl
View file

@ -95,7 +95,7 @@
{{if or .CanWriteIssues .CanWritePulls}} {{if or .CanWriteIssues .CanWritePulls}}
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.milestones.deletion"}} {{.i18n.Tr "repo.milestones.deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/issue/view_content.tmpl
View file

@ -219,7 +219,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.branch.delete" .HeadTarget }} {{.i18n.Tr "repo.branch.delete" .HeadTarget }}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/issue/view_content/sidebar.tmpl
View file

@ -611,7 +611,7 @@
<div class="ui basic modal remove-dependency"> <div class="ui basic modal remove-dependency">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.issues.dependency.remove_header"}} {{.i18n.Tr "repo.issues.dependency.remove_header"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/projects/list.tmpl
View file

@ -78,7 +78,7 @@
{{if or .CanWriteIssues .CanWritePulls}} {{if or .CanWriteIssues .CanWritePulls}}
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.projects.deletion"}} {{.i18n.Tr "repo.projects.deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/release/new.tmpl
View file

@ -99,7 +99,7 @@
{{if .PageIsEditRelease}} {{if .PageIsEditRelease}}
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.release.deletion"}} {{.i18n.Tr "repo.release.deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/settings/collaboration.tmpl
View file

@ -114,7 +114,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.settings.collaborator_deletion"}} {{.i18n.Tr "repo.settings.collaborator_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/settings/deploy_keys.tmpl
View file

@ -82,7 +82,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.settings.deploy_key_deletion"}} {{.i18n.Tr "repo.settings.deploy_key_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/settings/webhook/delete_modal.tmpl
View file

@ -1,6 +1,6 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.settings.webhook_deletion"}} {{.i18n.Tr "repo.settings.webhook_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/repo/wiki/view.tmpl
View file

@ -101,7 +101,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "repo.wiki.delete_page_button"}} {{.i18n.Tr "repo.wiki.delete_page_button"}}
</div> </div>
<div class="content"> <div class="content">

4
templates/user/settings/account.tmpl
View file

@ -194,7 +194,7 @@
<div class="ui small basic delete modal" id="delete-email"> <div class="ui small basic delete modal" id="delete-email">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.email_deletion"}} {{.i18n.Tr "settings.email_deletion"}}
</div> </div>
<div class="content"> <div class="content">
@ -205,7 +205,7 @@
<div class="ui small basic delete modal" id="delete-account"> <div class="ui small basic delete modal" id="delete-account">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.delete_account_title"}} {{.i18n.Tr "settings.delete_account_title"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/applications.tmpl
View file

@ -55,7 +55,7 @@
<div class="ui small basic delete modal" id="delete-token"> <div class="ui small basic delete modal" id="delete-token">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.access_token_deletion"}} {{.i18n.Tr "settings.access_token_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/applications_oauth2.tmpl
View file

@ -48,7 +48,7 @@
<div class="ui small basic delete modal" id="remove-gitea-oauth2-application"> <div class="ui small basic delete modal" id="remove-gitea-oauth2-application">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.remove_oauth2_application"}} {{.i18n.Tr "settings.remove_oauth2_application"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/applications_oauth2_edit.tmpl
View file

@ -57,7 +57,7 @@
<div class="ui small basic delete modal" id="delete-oauth2-application"> <div class="ui small basic delete modal" id="delete-oauth2-application">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.remove_oauth2_application"}} {{.i18n.Tr "settings.remove_oauth2_application"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/keys_gpg.tmpl
View file

@ -59,7 +59,7 @@
<div class="ui small basic delete modal" id="delete-gpg"> <div class="ui small basic delete modal" id="delete-gpg">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.gpg_key_deletion"}} {{.i18n.Tr "settings.gpg_key_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/keys_principal.tmpl
View file

@ -56,7 +56,7 @@
<div class="ui small basic delete modal" id="delete-principal"> <div class="ui small basic delete modal" id="delete-principal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.ssh_principal_deletion"}} {{.i18n.Tr "settings.ssh_principal_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/keys_ssh.tmpl
View file

@ -63,7 +63,7 @@
<div class="ui small basic delete modal" id="delete-ssh"> <div class="ui small basic delete modal" id="delete-ssh">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.ssh_key_deletion"}} {{.i18n.Tr "settings.ssh_key_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/repos.tmpl
View file

@ -142,7 +142,7 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.remove_account_link"}} {{.i18n.Tr "settings.remove_account_link"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/security_accountlinks.tmpl
View file

@ -26,7 +26,7 @@
<div class="ui small basic delete modal" id="delete-account-link"> <div class="ui small basic delete modal" id="delete-account-link">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.remove_account_link"}} {{.i18n.Tr "settings.remove_account_link"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/security_openid.tmpl
View file

@ -53,7 +53,7 @@
<div class="ui small basic delete modal" id="delete-openid"> <div class="ui small basic delete modal" id="delete-openid">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.openid_deletion"}} {{.i18n.Tr "settings.openid_deletion"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/security_twofa.tmpl
View file

@ -25,7 +25,7 @@
<div class="ui small basic delete modal" id="disable-twofa"> <div class="ui small basic delete modal" id="disable-twofa">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.twofa_disable"}} {{.i18n.Tr "settings.twofa_disable"}}
</div> </div>
<div class="content"> <div class="content">

2
templates/user/settings/security_u2f.tmpl
View file

@ -45,7 +45,7 @@
<div class="ui small basic delete modal" id="delete-registration"> <div class="ui small basic delete modal" id="delete-registration">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> {{svg "octicon-trashcan"}}
{{.i18n.Tr "settings.u2f_delete_key"}} {{.i18n.Tr "settings.u2f_delete_key"}}
</div> </div>
<div class="content"> <div class="content">

17
web_src/less/_base.less
View file

@ -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 { .file-comment {