Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace footer and modal icons with SVG #13245

Merged
merged 2 commits into from
Oct 21, 2020
Merged

Replace footer and modal icons with SVG #13245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f49afdf
Replace footer and modal icons with SVG
silverwind Oct 21, 2020
a5617d2
Merge branch 'master' into more-octicons-2
lafriks Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/admin/auth/edit.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/repo/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/user/edit.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions templates/base/delete_modal_actions.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions templates/base/footer_content.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion templates/org/settings/delete.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/org/team/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/org/team/repositories.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/branch/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/labels/edit_delete_label.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/milestones.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/view_content.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/view_content/sidebar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/projects/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/release/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/settings/collaboration.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/settings/deploy_keys.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/settings/webhook/delete_modal.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/wiki/view.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions templates/user/settings/account.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/applications.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/applications_oauth2.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/applications_oauth2_edit.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/keys_gpg.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/keys_principal.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/keys_ssh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/repos.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/security_accountlinks.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/security_openid.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/security_twofa.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/security_u2f.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
17 changes: 17 additions & 0 deletions web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down