Skip to content

Commit 0d0fb0e

Browse files
sapksapk
committed
Some cleaning
1 parent 6157817 commit 0d0fb0e

File tree

9 files changed

+86
-129
lines changed

9 files changed

+86
-129
lines changed

‎public/css/index.css

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,16 +2374,14 @@ footer .ui.language .menu {
23742374
.settings .content .segment {
23752375
box-shadow: 0 1px 2px 0 rgba(34, 36, 38, 0.15);
23762376
}
2377-
.settings .key.list .item:not(:first-child) {
2377+
.settings .list .item:not(:first-child) {
23782378
border-top: 1px solid #eaeaea;
2379+
padding: 1rem;
2380+
margin: 15px -1rem -1rem -1rem;
2381+
min-height: 60px;
23792382
}
2380-
.settings .key.list .meta {
2383+
.settings .list.key .meta {
23812384
padding-top: 5px;
2382-
}
2383-
.settings .key.list .print {
2384-
color: #767676;
2385-
}
2386-
.settings .key.list .activity {
23872385
color: #666;
23882386
}
23892387
.settings .hook.list > .item:not(:first-child) {
@@ -2729,18 +2727,6 @@ footer .ui.language .menu {
27292727
padding-top: 15px;
27302728
padding-bottom: 80px;
27312729
}
2732-
.user.settings .list .item.ui.grid {
2733-
margin-top: 15px;
2734-
}
2735-
.user.settings .email.list .item:not(:first-child),
2736-
.user.settings .openid.list .item:not(:first-child) {
2737-
border-top: 1px solid #eaeaea;
2738-
height: 50px;
2739-
}
2740-
.user.settings .email.list .item:not(:first-child) .button,
2741-
.user.settings .openid.list .item:not(:first-child) .button {
2742-
margin-top: -10px;
2743-
}
27442730
.user.profile .ui.card .username {
27452731
display: block;
27462732
}

‎public/less/_repository.less

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,18 +1362,18 @@
13621362
box-shadow: 0 1px 2px 0 rgba(34,36,38,.15);
13631363
}
13641364
}
1365-
.key.list {
1365+
.list {
13661366
.item:not(:first-child) {
13671367
border-top: 1px solid #eaeaea;
1368+
padding:1rem;
1369+
margin: 15px -1rem -1rem -1rem;
1370+
min-height: 60px;
13681371
}
1369-
.meta {
1370-
padding-top: 5px;
1371-
}
1372-
.print {
1373-
color: #767676;
1374-
}
1375-
.activity {
1376-
color: #666;
1372+
&.key{
1373+
.meta {
1374+
padding-top: 5px;
1375+
color: #666;
1376+
}
13771377
}
13781378
}
13791379
.hook.list {

‎public/less/_user.less

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,6 @@
44
padding-bottom: @footer-margin * 2;
55
}
66

7-
&.settings {
8-
.list {
9-
.item.ui.grid {
10-
margin-top: 15px;
11-
}
12-
}
13-
.email.list, .openid.list {
14-
.item:not(:first-child) {
15-
border-top: 1px solid #eaeaea;
16-
height: 50px;
17-
.button {
18-
margin-top: -10px;
19-
}
20-
}
21-
}
22-
}
23-
247
&.profile {
258
.ui.card {
269
.username {

‎templates/repo/settings/deploy_keys.tmpl

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,22 @@
1414
{{if .Deploykeys}}
1515
<div class="ui key list">
1616
{{range .Deploykeys}}
17-
<div class="item ui grid">
18-
<div class="one wide column">
19-
<i class="ssh-key-state-indicator fa fa-circle{{if .HasRecentActivity}} active invert poping up{{else}}-o{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted"{{end}}></i>
20-
</div>
21-
<div class="one wide column">
22-
<i class="mega-octicon octicon-key left"></i>
23-
</div>
24-
<div class="eleven wide column">
25-
<strong>{{.Name}}</strong>
26-
<div class="print meta">
27-
{{.Fingerprint}}
17+
<div class="item">
18+
<div class="right floated content">
19+
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
20+
{{$.i18n.Tr "settings.delete_key"}}
21+
</button>
22+
</div>
23+
<i class="big key icon {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted"{{end}}></i>
24+
<div class="content">
25+
<strong>{{.Name}}</strong>
26+
<div class="print meta">
27+
{{.Fingerprint}}
28+
</div>
29+
<div class="activity meta">
30+
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}style="color: #21ba45;"{{end}}>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
31+
</div>
2832
</div>
29-
<div class="activity meta">
30-
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
31-
</div>
32-
</div>
33-
<div class="two wide column">
34-
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
35-
{{$.i18n.Tr "settings.delete_key"}}
36-
</button>
37-
</div>
3833
</div>
3934
{{end}}
4035
</div>

‎templates/user/settings/account_link.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
</div>
1414
{{if .AccountLinks}}
1515
{{range $loginSource, $provider := .AccountLinks}}
16-
<div class="item ui grid">
17-
<div class="column">
18-
<strong>{{$provider}}</strong>
19-
{{if $loginSource.IsActived}}<span class="text red">{{$.i18n.Tr "settings.active"}}</span>{{end}}
20-
<div class="ui right">
16+
<div class="item">
17+
<div class="right floated content">
2118
<button class="ui red tiny button delete-button" data-url="{{$.Link}}" data-id="{{$loginSource.ID}}">
2219
{{$.i18n.Tr "settings.delete_key"}}
2320
</button>
21+
</div>
22+
<div class="content">
23+
<strong>{{$provider}}</strong>
24+
{{if $loginSource.IsActived}}<span class="text red">{{$.i18n.Tr "settings.active"}}</span>{{end}}
2425
</div>
25-
</div>
2626
</div>
2727
{{end}}
2828
{{end}}

‎templates/user/settings/applications.tmpl

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,19 @@
1515
{{.i18n.Tr "settings.tokens_desc"}}
1616
</div>
1717
{{range .Tokens}}
18-
<div class="item ui grid">
19-
<div class="one wide column">
20-
<i class="ssh-key-state-indicator fa fa-circle{{if .HasRecentActivity}} active invert poping up{{else}}-o{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.token_state_desc"}}" data-variation="inverted tiny"{{end}}></i>
21-
</div>
22-
<div class="one wide column">
23-
<i class="fa fa-send fa-2x left"></i>
24-
</div>
25-
<div class="eleven wide column">
26-
<strong>{{.Name}}</strong>
27-
<div class="activity meta">
28-
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
18+
<div class="item">
19+
<div class="right floated content">
20+
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
21+
{{$.i18n.Tr "settings.delete_token"}}
22+
</button>
23+
</div>
24+
<i class="big send icon {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.token_state_desc"}}" data-variation="inverted tiny"{{end}}></i>
25+
<div class="content">
26+
<strong>{{.Name}}</strong>
27+
<div class="activity meta">
28+
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}style="color: #21ba45;"{{end}}>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
29+
</div>
2930
</div>
30-
</div>
31-
<div class="two wide column">
32-
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
33-
{{$.i18n.Tr "settings.delete_token"}}
34-
</button>
35-
</div>
3631
</div>
3732
{{end}}
3833
</div>

‎templates/user/settings/email.tmpl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@
1212
{{.i18n.Tr "settings.email_desc"}}
1313
</div>
1414
{{range .Emails}}
15-
<div class="item ui grid">
16-
<div class="column">
17-
<strong>{{.Email}}</strong>
18-
{{if .IsPrimary}}<span class="text red">{{$.i18n.Tr "settings.primary"}}</span>{{end}}
15+
<div class="item">
1916
{{if not .IsPrimary}}
20-
<div class="ui right">
17+
<div class="right floated content">
2118
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
2219
{{$.i18n.Tr "settings.delete_key"}}
2320
</button>
24-
</div>
25-
{{if .IsActivated}}
26-
<div class="ui right">
27-
<form action="{{$.Link}}" method="post">
28-
{{$.CsrfTokenHtml}}
29-
<input name="_method" type="hidden" value="PRIMARY">
30-
<input name="id" type="hidden" value="{{.ID}}">
31-
<button class="ui green tiny button">{{$.i18n.Tr "settings.primary_email"}}</button>
32-
</form>
33-
</div>
34-
{{end}}
21+
</div>
22+
{{if .IsActivated}}
23+
<div class="right floated content">
24+
<form action="{{$.Link}}" method="post">
25+
{{$.CsrfTokenHtml}}
26+
<input name="_method" type="hidden" value="PRIMARY">
27+
<input name="id" type="hidden" value="{{.ID}}">
28+
<button class="ui green tiny button">{{$.i18n.Tr "settings.primary_email"}}</button>
29+
</form>
30+
</div>
31+
{{end}}
3532
{{end}}
36-
</div>
33+
<div class="content">
34+
<strong>{{.Email}}</strong>
35+
{{if .IsPrimary}}<span class="text red">{{$.i18n.Tr "settings.primary"}}</span>{{end}}
36+
</div>
3737
</div>
3838
{{end}}
3939
</div>

‎templates/user/settings/openid.tmpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@
1212
{{.i18n.Tr "settings.openid_desc"}}
1313
</div>
1414
{{range .OpenIDs}}
15-
<div class="item ui grid">
16-
<div class="column">
17-
<strong>{{.URI}}</strong>
18-
<div class="ui right">
15+
<div class="item">
16+
<div class="right floated content">
1917
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
2018
{{$.i18n.Tr "settings.delete_key"}}
2119
</button>
22-
</div>
23-
<div class="ui right">
20+
</div>
21+
<div class="right floated content">
2422
<form action="{{$.Link}}/toggle_visibility" method="post">
2523
{{$.CsrfTokenHtml}}
2624
<input name="id" type="hidden" value="{{.ID}}">
@@ -38,7 +36,9 @@
3836
</button>
3937
</form>
4038
</div>
41-
</div>
39+
<div class="content">
40+
<strong>{{.URI}}</strong>
41+
</div>
4242
</div>
4343
{{end}}
4444
</div>

‎templates/user/settings/sshkeys.tmpl

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,22 @@
1515
{{.i18n.Tr "settings.ssh_desc"}}
1616
</div>
1717
{{range .Keys}}
18-
<div class="item ui grid">
19-
<div class="two wide column center aligned">
20-
<i class="mega-octicon octicon-key" {{if .HasRecentActivity}}style="color: #21ba45;" data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted tiny"{{end}}></i>
21-
</div>
22-
<div class="eleven wide column">
23-
<strong>{{.Name}}</strong>
24-
<div class="print meta">
25-
{{.Fingerprint}}
18+
<div class="item">
19+
<div class="right floated content">
20+
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
21+
{{$.i18n.Tr "settings.delete_key"}}
22+
</button>
23+
</div>
24+
<i class="big key icon {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted tiny"{{end}}></i>
25+
<div class="content">
26+
<strong>{{.Name}}</strong>
27+
<div class="print meta">
28+
{{.Fingerprint}}
29+
</div>
30+
<div class="activity meta">
31+
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}style="color: #21ba45;"{{end}}>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
32+
</div>
2633
</div>
27-
<div class="activity meta">
28-
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}style="color: #21ba45;"{{end}} >{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
29-
</div>
30-
</div>
31-
<div class="two wide column center aligned">
32-
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
33-
{{$.i18n.Tr "settings.delete_key"}}
34-
</button>
35-
</div>
3634
</div>
3735
{{end}}
3836
</div>

0 commit comments

Comments
 (0)