domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Make SVG size argument optional (#12814)

Browse source 
Now defaults to 16 on both frontend and backend.

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
silverwind 2020-09-11 22:19:00 +02:00 • committed by GitHub
parent 26c4a049da
commit ffddf3f8a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
89 changed files with 458 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@
</h4>
<div class="ui attached warning segment">
<div class="ui red message">
<p class="text left">{{svg "octicon-alert" 16}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
<p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
</div>
<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
{{.CsrfTokenHtml}}

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

@ -22,7 +22,7 @@
<div class="content">
<strong>{{.Name}}</strong>
<div class="activity meta">
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
</div>
</div>
</div>

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

@ -29,7 +29,7 @@
{{.Fingerprint}}
</div>
<div class="activity meta">
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
</div>
</div>
</div>

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

@ -13,13 +13,13 @@
<div class="item">
<div class="content">
{{if .IsPrivate}}
<span class="text gold iconFloat">{{svg "octicon-lock" 16}}</span>
<span class="text gold iconFloat">{{svg "octicon-lock"}}</span>
{{else if .IsFork}}
<span class="iconFloat">{{svg "octicon-repo-forked" 16}}</span>
<span class="iconFloat">{{svg "octicon-repo-forked"}}</span>
{{else if .IsMirror}}
<span class="iconFloat">{{svg "octicon-mirror" 16}}</span>
<span class="iconFloat">{{svg "octicon-mirror"}}</span>
{{else}}
<span class="iconFloat">{{svg "octicon-repo" 16}}</span>
<span class="iconFloat">{{svg "octicon-repo"}}</span>
{{end}}
<a class="name" href="{{AppSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{$.Owner.Name}}/{{.Name}}</a>
<span>{{SizeFmt .Size}}</span>

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

@ -24,7 +24,7 @@
<label for="nickname">{{.i18n.Tr "settings.u2f_nickname"}}</label>
<input id="nickname" name="nickname" type="text" required>
</div>
<button id="register-security-key" class="ui green button">{{svg "octicon-key" 16}} {{.i18n.Tr "settings.u2f_register_key"}}</button>
<button id="register-security-key" class="ui green button">{{svg "octicon-key"}} {{.i18n.Tr "settings.u2f_register_key"}}</button>
</div>
{{else}}
<b>{{.i18n.Tr "settings.u2f_require_twofa"}}</b>