Skip to content

Commit c85bb62

Browse files
Replace more icons with SVG, repo search tweaks (#13860)
* Replace more icons with SVG - Replace remaining icons on admin page with SVG - Fix vertical menu background on arc-green - Minor improvments to frontpage repo search - More icon replacements here and there * fix integration * whitespace tweak * add comment Co-authored-by: techknowlogick <[email protected]>
1 parent 6edfa6b commit c85bb62

30 files changed

+166
-108
lines changed

integrations/auth_ldap_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,14 @@ func TestLDAPUserSync(t *testing.T) {
172172
assert.Equal(t, u.UserName, strings.TrimSpace(tds.Find("td:nth-child(2) a").Text()))
173173
assert.Equal(t, u.Email, strings.TrimSpace(tds.Find("td:nth-child(3) span").Text()))
174174
if u.IsAdmin {
175-
assert.True(t, tds.Find("td:nth-child(5) i").HasClass("fa-check-square-o"))
175+
assert.True(t, tds.Find("td:nth-child(5) svg").HasClass("octicon-check"))
176176
} else {
177-
assert.True(t, tds.Find("td:nth-child(5) i").HasClass("fa-square-o"))
177+
assert.True(t, tds.Find("td:nth-child(5) svg").HasClass("octicon-x"))
178178
}
179179
if u.IsRestricted {
180-
assert.True(t, tds.Find("td:nth-child(6) i").HasClass("fa-check-square-o"))
180+
assert.True(t, tds.Find("td:nth-child(6) svg").HasClass("octicon-check"))
181181
} else {
182-
assert.True(t, tds.Find("td:nth-child(6) i").HasClass("fa-square-o"))
182+
assert.True(t, tds.Find("td:nth-child(6) svg").HasClass("octicon-x"))
183183
}
184184
}
185185

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

templates/admin/auth/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
<td>{{.ID}}</td>
2929
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
3030
<td>{{.TypeName}}</td>
31-
<td><i class="fa fa{{if .IsActived}}-check{{end}}-square-o"></i></td>
31+
<td>{{if .IsActived}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
3232
<td><span class="poping up" data-content="{{.UpdatedUnix.FormatShort}}" data-variation="tiny">{{.UpdatedUnix.FormatShort}}</span></td>
3333
<td><span class="poping up" data-content="{{.CreatedUnix.FormatLong}}" data-variation="tiny">{{.CreatedUnix.FormatShort}}</span></td>
34-
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}"><i class="fa fa-pencil-square-o"></i></a></td>
34+
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
3535
</tr>
3636
{{end}}
3737
</tbody>

templates/admin/config.tmpl

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<dt>{{.i18n.Tr "admin.config.domain"}}</dt>
2020
<dd>{{.Domain}}</dd>
2121
<dt>{{.i18n.Tr "admin.config.offline_mode"}}</dt>
22-
<dd><i class="fa fa{{if .OfflineMode}}-check{{end}}-square-o"></i></dd>
22+
<dd>{{if .OfflineMode}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
2323
<dt>{{.i18n.Tr "admin.config.disable_router_log"}}</dt>
24-
<dd><i class="fa fa{{if .DisableRouterLog}}-check{{end}}-square-o"></i></dd>
24+
<dd>{{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
2525

2626
<div class="ui divider"></div>
2727

@@ -67,10 +67,10 @@
6767
<div class="ui attached table segment">
6868
<dl class="dl-horizontal admin-dl-horizontal">
6969
<dt>{{.i18n.Tr "admin.config.ssh_enabled"}}</dt>
70-
<dd><i class="fa fa{{if not .SSH.Disabled}}-check{{end}}-square-o"></i></dd>
70+
<dd>{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
7171
{{if not .SSH.Disabled}}
7272
<dt>{{.i18n.Tr "admin.config.ssh_start_builtin_server"}}</dt>
73-
<dd><i class="fa fa{{if .SSH.StartBuiltinServer}}-check{{end}}-square-o"></i></dd>
73+
<dd>{{if not .SSH.StartBuiltinServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
7474
<dt>{{.i18n.Tr "admin.config.ssh_domain"}}</dt>
7575
<dd>{{.SSH.Domain}}</dd>
7676
<dt>{{.i18n.Tr "admin.config.ssh_port"}}</dt>
@@ -86,7 +86,7 @@
8686
<dt>{{.i18n.Tr "admin.config.ssh_keygen_path"}}</dt>
8787
<dd>{{.SSH.KeygenPath}}</dd>
8888
<dt>{{.i18n.Tr "admin.config.ssh_minimum_key_size_check"}}</dt>
89-
<dd><i class="fa fa{{if .SSH.MinimumKeySizeCheck}}-check{{end}}-square-o"></i></dd>
89+
<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
9090
{{if .SSH.MinimumKeySizeCheck}}
9191
<dt>{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
9292
<dd>{{.SSH.MinimumKeySizes}}</dd>
@@ -102,7 +102,7 @@
102102
<div class="ui attached table segment">
103103
<dl class="dl-horizontal admin-dl-horizontal">
104104
<dt>{{.i18n.Tr "admin.config.lfs_enabled"}}</dt>
105-
<dd><i class="fa fa{{if .LFS.StartServer}}-check{{end}}-square-o"></i></dd>
105+
<dd>{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
106106
{{if .LFS.StartServer}}
107107
<dt>{{.i18n.Tr "admin.config.lfs_content_path"}}</dt>
108108
<dd>{{.LFS.Path}}</dd>
@@ -146,44 +146,44 @@
146146
<div class="ui attached table segment">
147147
<dl class="dl-horizontal admin-dl-horizontal">
148148
<dt>{{.i18n.Tr "admin.config.register_email_confirm"}}</dt>
149-
<dd><i class="fa fa{{if .Service.RegisterEmailConfirm}}-check{{end}}-square-o"></i></dd>
149+
<dd>{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
150150
<dt>{{.i18n.Tr "admin.config.disable_register"}}</dt>
151-
<dd><i class="fa fa{{if .Service.DisableRegistration}}-check{{end}}-square-o"></i></dd>
151+
<dd>{{if .Service.DisableRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
152152
<dt>{{.i18n.Tr "admin.config.allow_only_external_registration"}}</dt>
153-
<dd><i class="fa fa{{if .Service.AllowOnlyExternalRegistration}}-check{{end}}-square-o"></i></dd>
153+
<dd>{{if .Service.AllowOnlyExternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
154154
<dt>{{.i18n.Tr "admin.config.show_registration_button"}}</dt>
155-
<dd><i class="fa fa{{if .Service.ShowRegistrationButton}}-check{{end}}-square-o"></i></dd>
155+
<dd>{{if .Service.ShowRegistrationButton}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
156156
<dt>{{.i18n.Tr "admin.config.enable_openid_signup"}}</dt>
157-
<dd><i class="fa fa{{if .Service.EnableOpenIDSignUp}}-check{{end}}-square-o"></i></dd>
157+
<dd>{{if .Service.EnableOpenIDSignUp}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
158158
<dt>{{.i18n.Tr "admin.config.enable_openid_signin"}}</dt>
159-
<dd><i class="fa fa{{if .Service.EnableOpenIDSignIn}}-check{{end}}-square-o"></i></dd>
159+
<dd>{{if .Service.EnableOpenIDSignIn}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
160160
<dt>{{.i18n.Tr "admin.config.require_sign_in_view"}}</dt>
161-
<dd><i class="fa fa{{if .Service.RequireSignInView}}-check{{end}}-square-o"></i></dd>
161+
<dd>{{if .Service.RequireSignInView}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
162162
<dt>{{.i18n.Tr "admin.config.mail_notify"}}</dt>
163-
<dd><i class="fa fa{{if .Service.EnableNotifyMail}}-check{{end}}-square-o"></i></dd>
164-
{{/*<dt>{{.i18n.Tr "admin.config.disable_key_size_check"}}</dt>
165-
<dd><i class="fa fa{{if .Service.DisableMinimumKeySizeCheck}}-check{{end}}-square-o"></i></dd>*/}}
163+
<dd>{{if .Service.EnableNotifyMail}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
164+
<dt>{{.i18n.Tr "admin.config.disable_key_size_check"}}</dt>
165+
<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
166166
<dt>{{.i18n.Tr "admin.config.enable_captcha"}}</dt>
167-
<dd><i class="fa fa{{if .Service.EnableCaptcha}}-check{{end}}-square-o"></i></dd>
167+
<dd>{{if .Service.EnableCaptcha}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
168168
<dt>{{.i18n.Tr "admin.config.default_keep_email_private"}}</dt>
169-
<dd><i class="fa fa{{if .Service.DefaultKeepEmailPrivate}}-check{{end}}-square-o"></i></dd>
169+
<dd>{{if .Service.DefaultKeepEmailPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
170170
<dt>{{.i18n.Tr "admin.config.default_allow_create_organization"}}</dt>
171-
<dd><i class="fa fa{{if .Service.DefaultAllowCreateOrganization}}-check{{end}}-square-o"></i></dd>
171+
<dd>{{if .Service.DefaultAllowCreateOrganization}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
172172
<dt>{{.i18n.Tr "admin.config.enable_timetracking"}}</dt>
173-
<dd><i class="fa fa{{if .Service.EnableTimetracking}}-check{{end}}-square-o"></i></dd>
173+
<dd>{{if .Service.EnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
174174
{{if .Service.EnableTimetracking}}
175175
<dt>{{.i18n.Tr "admin.config.default_enable_timetracking"}}</dt>
176-
<dd><i class="fa fa{{if .Service.DefaultEnableTimetracking}}-check{{end}}-square-o"></i></dd>
176+
<dd>{{if .Service.DefaultEnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
177177
<dt>{{.i18n.Tr "admin.config.default_allow_only_contributors_to_track_time"}}</dt>
178-
<dd><i class="fa fa{{if .Service.DefaultAllowOnlyContributorsToTrackTime}}-check{{end}}-square-o"></i></dd>
178+
<dd>{{if .Service.DefaultAllowOnlyContributorsToTrackTime}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
179179
{{end}}
180180
<dt>{{.i18n.Tr "admin.config.default_visibility_organization"}}</dt>
181181
<dd>{{.Service.DefaultOrgVisibility}}</dd>
182182

183183
<dt>{{.i18n.Tr "admin.config.no_reply_address"}}</dt>
184184
<dd>{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}</dd>
185185
<dt>{{.i18n.Tr "admin.config.default_enable_dependencies"}}</dt>
186-
<dd><i class="fa fa{{if .Service.DefaultEnableDependencies}}-check{{end}}-square-o"></i></dd>
186+
<dd>{{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
187187
<div class="ui divider"></div>
188188
<dt>{{.i18n.Tr "admin.config.active_code_lives"}}</dt>
189189
<dd>{{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}</dd>
@@ -202,7 +202,7 @@
202202
<dt>{{.i18n.Tr "admin.config.deliver_timeout"}}</dt>
203203
<dd>{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
204204
<dt>{{.i18n.Tr "admin.config.skip_tls_verify"}}</dt>
205-
<dd><i class="fa fa{{if .Webhook.SkipTLSVerify}}-check{{end}}-square-o"></i></dd>
205+
<dd>{{if .Webhook.SkipTLSVerify}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
206206
</dl>
207207
</div>
208208

@@ -212,18 +212,18 @@
212212
<div class="ui attached table segment">
213213
<dl class="dl-horizontal admin-dl-horizontal">
214214
<dt>{{.i18n.Tr "admin.config.mailer_enabled"}}</dt>
215-
<dd><i class="fa fa{{if .MailerEnabled}}-check{{end}}-square-o"></i></dd>
215+
<dd>{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
216216
{{if .MailerEnabled}}
217217
<dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt>
218218
<dd>{{.Mailer.Name}}</dd>
219219
{{if eq .Mailer.MailerType "smtp"}}
220220
<dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt>
221-
<dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd>
221+
<dd>{{if .DisableHelo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
222222
<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
223223
<dd>{{.Mailer.Host}}</dd>
224224
{{else if eq .Mailer.MailerType "sendmail"}}
225225
<dt>{{.i18n.Tr "admin.config.mailer_use_sendmail"}}</dt>
226-
<dd><i class="fa fa-check-square-o"></i></dd>
226+
<dd>{{svg "octicon-check"}}</dd>
227227
<dt>{{.i18n.Tr "admin.config.mailer_sendmail_path"}}</dt>
228228
<dd>{{.Mailer.SendmailPath}}</dd>
229229
<dt>{{.i18n.Tr "admin.config.mailer_sendmail_args"}}</dt>
@@ -282,7 +282,7 @@
282282
<dt>{{.i18n.Tr "admin.config.session_life_time"}}</dt>
283283
<dd>{{.SessionConfig.Maxlifetime}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
284284
<dt>{{.i18n.Tr "admin.config.https_only"}}</dt>
285-
<dd><i class="fa fa{{if .SessionConfig.Secure}}-check{{end}}-square-o"></i></dd>
285+
<dd>{{if .SessionConfig.Secure}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
286286
</dl>
287287
</div>
288288

@@ -292,10 +292,10 @@
292292
<div class="ui attached table segment">
293293
<dl class="dl-horizontal admin-dl-horizontal">
294294
<dt>{{.i18n.Tr "admin.config.disable_gravatar"}}</dt>
295-
<dd><i class="fa fa{{if .DisableGravatar}}-check{{end}}-square-o"></i></dd>
295+
<dd>{{if .DisableGravatar}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
296296
<div class="ui divider"></div>
297297
<dt>{{.i18n.Tr "admin.config.enable_federated_avatar"}}</dt>
298-
<dd><i class="fa fa{{if .EnableFederatedAvatar}}-check{{end}}-square-o"></i></dd>
298+
<dd>{{if .EnableFederatedAvatar}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
299299
</dl>
300300
</div>
301301

@@ -305,7 +305,7 @@
305305
<div class="ui attached table segment">
306306
<dl class="dl-horizontal admin-dl-horizontal">
307307
<dt>{{.i18n.Tr "admin.config.git_disable_diff_highlight"}}</dt>
308-
<dd><i class="fa fa{{if .Git.DisableDiffHighlight}}-check{{end}}-square-o"></i></dd>
308+
<dd>{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
309309
<dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt>
310310
<dd>{{.Git.MaxGitDiffLines}}</dd>
311311
<dt>{{.i18n.Tr "admin.config.git_max_diff_line_characters"}}</dt>
@@ -411,7 +411,7 @@
411411
<dd>{{$.i18n.Tr "admin.config.routes_to_default_logger"}}</dd>
412412
{{end}}
413413
<dt>{{$.i18n.Tr "admin.config.xorm_log_sql"}}</dt>
414-
<dd><i class="fa fa{{if $.LogSQL}}-check{{end}}-square-o"></i></dd>
414+
<dd>{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
415415
{{else}}
416416
<dd>{{$.i18n.Tr "admin.config.disabled_logger"}}</dd>
417417
{{end}}

templates/admin/emails/list.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@
5252
<td><a href="{{AppSubUrl}}/{{.Name}}">{{.Name}}</a></td>
5353
<td><span class="text truncate">{{.FullName}}</span></td>
5454
<td><span class="text email">{{.Email}}</span></td>
55-
<td><i class="fa fa{{if .IsPrimary}}-check{{end}}-square-o"></i></td>
55+
<td>{{if .IsPrimary}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td><
5656
<td>
5757
{{if .CanChange}}
5858
<a class="link-email-action" href data-uid="{{.UID}}"
5959
data-email="{{.Email}}"
6060
data-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
6161
data-activate="{{if .IsActivated}}0{{else}}1{{end}}">
62-
<i class="fa fa{{if .IsActivated}}-check{{end}}-square-o"></i>
62+
{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
6363
</a>
6464
{{else}}
65-
<i class="fa fa{{if .IsActivated}}-check{{end}}-square-o"></i>
65+
{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
6666
{{end}}
6767
</td>
6868
</tr>

templates/admin/monitor.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<td>{{.Description}}</td>
8787
<td>{{DateFmtLong .Start}}</td>
8888
<td>{{TimeSince .Start $.Lang}}</td>
89-
<td><a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Description}}"><i class="close icon text red"></i></a></td>
89+
<td><a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Description}}">{{svg "octicon-trashcan" 16 "text-red"}}</a></td>
9090
</tr>
9191
{{end}}
9292
</tbody>
@@ -96,7 +96,7 @@
9696
</div>
9797
<div class="ui small basic delete modal">
9898
<div class="ui icon header">
99-
<i class="close icon"></i>
99+
{{svg "octicon-x" 16 "close inside"}}
100100
{{.i18n.Tr "admin.monitor.process.cancel"}}
101101
</div>
102102
<div class="content">

templates/admin/notice.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<td>{{$.i18n.Tr .TrStr}}</td>
3131
<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
3232
<td><span class="notice-created-time poping up" data-content="{{.CreatedUnix.AsTime}}" data-variation="inverted tiny">{{.CreatedUnix.FormatShort}}</span></td>
33-
<td><a href="#"><i class="browser icon view-detail"></i></a></td>
33+
<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
3434
</tr>
3535
{{end}}
3636
</tbody>
@@ -74,7 +74,7 @@
7474
</div>
7575

7676
<div class="ui modal admin" id="detail-modal">
77-
<i class="close icon inside"></i>
77+
{{svg "octicon-x" 16 "close inside"}}
7878
<div class="header">{{$.i18n.Tr "admin.notices.view_detail_header"}}</div>
7979
<div class="content">
8080
<div class="sub header"></div>

templates/admin/org/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<td>{{.NumMembers}}</td>
4646
<td>{{.NumRepos}}</td>
4747
<td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td>
48-
<td><a href="{{AppSubUrl}}/org/{{.Name}}/settings"><i class="fa fa-pencil-square-o"></i></a></td>
48+
<td><a href="{{AppSubUrl}}/org/{{.Name}}/settings">{{svg "octicon-pencil"}}</a></td>
4949
</tr>
5050
{{end}}
5151
</tbody>

templates/admin/queue.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@
126126
<tbody>
127127
{{range .Queue.Workers}}
128128
<tr>
129-
<td>{{.Workers}}{{if .IsFlusher}}<i class="icon sync-alternate" title="{{.i18n.Tr "admin.monitor.queue.flush"}}"></i>{{end}}</td>
129+
<td>{{.Workers}}{{if .IsFlusher}}<span title="{{.i18n.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
130130
<td>{{DateFmtLong .Start}}</td>
131131
<td>{{if .HasTimeout}}{{DateFmtLong .Timeout}}{{else}}-{{end}}</td>
132132
<td>
133-
<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}"><i class="close icon text red" title="{{$.i18n.Tr "remove"}}"></i></a>
133+
<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}"><span class="text red" title="{{$.i18n.Tr "remove"}}">{{svg "octicon-trashcan"}}</span></a>
134134
</td>
135135
</tr>
136136
{{else}}
@@ -152,7 +152,7 @@
152152
</div>
153153
<div class="ui small basic delete modal">
154154
<div class="ui icon header">
155-
<i class="close icon"></i>
155+
{{svg "octicon-x" 16 "close inside"}}
156156
{{.i18n.Tr "admin.monitor.queue.pool.cancel"}}
157157
</div>
158158
<div class="content">

templates/admin/repo/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252
{{end}}
5353
</td>
5454
<td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
55-
<td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
55+
<td>{{if .IsPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
5656
<td>{{.NumWatches}}</td>
5757
<td>{{.NumStars}}</td>
5858
<td>{{.NumForks}}</td>
5959
<td>{{.NumIssues}}</td>
6060
<td>{{SizeFmt .Size}}</td>
6161
<td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td>
62-
<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}"><i class="trash icon text red"></i></a></td>
62+
<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trashcan"}}</a></td>
6363
</tr>
6464
{{end}}
6565
</tbody>

0 commit comments

Comments
 (0)