Skip to content

Commit 1359d18

Browse files
sapksapk
committed
Use octicon-key
1 parent 0d0fb0e commit 1359d18

File tree

5 files changed

+34
-10
lines changed

5 files changed

+34
-10
lines changed

‎public/css/index.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,12 +2374,23 @@ footer .ui.language .menu {
23742374
.settings .content .segment {
23752375
box-shadow: 0 1px 2px 0 rgba(34, 36, 38, 0.15);
23762376
}
2377+
.settings .list .item .green {
2378+
color: #21BA45 !important;
2379+
}
23772380
.settings .list .item:not(:first-child) {
23782381
border-top: 1px solid #eaeaea;
23792382
padding: 1rem;
23802383
margin: 15px -1rem -1rem -1rem;
23812384
min-height: 60px;
23822385
}
2386+
.settings .list .item > .mega-octicon {
2387+
display: table-cell;
2388+
}
2389+
.settings .list .item > .mega-octicon + .content {
2390+
display: table-cell;
2391+
padding: 0 0 0 .5em;
2392+
vertical-align: top;
2393+
}
23832394
.settings .list.key .meta {
23842395
padding-top: 5px;
23852396
color: #666;

‎public/less/_repository.less

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,11 +1363,24 @@
13631363
}
13641364
}
13651365
.list {
1366-
.item:not(:first-child) {
1367-
border-top: 1px solid #eaeaea;
1368-
padding:1rem;
1369-
margin: 15px -1rem -1rem -1rem;
1370-
min-height: 60px;
1366+
.item {
1367+
.green {
1368+
color: #21BA45 !important;
1369+
}
1370+
&:not(:first-child) {
1371+
border-top: 1px solid #eaeaea;
1372+
padding:1rem;
1373+
margin: 15px -1rem -1rem -1rem;
1374+
min-height: 60px;
1375+
}
1376+
> .mega-octicon {
1377+
display: table-cell;
1378+
}
1379+
> .mega-octicon + .content {
1380+
display: table-cell;
1381+
padding: 0 0 0 .5em;
1382+
vertical-align: top;
1383+
}
13711384
}
13721385
&.key{
13731386
.meta {

‎templates/repo/settings/deploy_keys.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
{{$.i18n.Tr "settings.delete_key"}}
2121
</button>
2222
</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>
23+
<i class="mega-octicon octicon-key {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted"{{end}}></i>
2424
<div class="content">
2525
<strong>{{.Name}}</strong>
2626
<div class="print meta">
2727
{{.Fingerprint}}
2828
</div>
2929
<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>
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}}class="green"{{end}}>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
3131
</div>
3232
</div>
3333
</div>

‎templates/user/settings/applications.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div class="content">
2626
<strong>{{.Name}}</strong>
2727
<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>
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}}class="green"{{end}}>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
2929
</div>
3030
</div>
3131
</div>

‎templates/user/settings/sshkeys.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
{{$.i18n.Tr "settings.delete_key"}}
2222
</button>
2323
</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>
24+
<i class="mega-octicon octicon-key {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted tiny"{{end}}></i>
2525
<div class="content">
2626
<strong>{{.Name}}</strong>
2727
<div class="print meta">
2828
{{.Fingerprint}}
2929
</div>
3030
<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>
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}}class="green"{{end}}>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
3232
</div>
3333
</div>
3434
</div>

0 commit comments

Comments
 (0)