* Fix #14238 * Fix #14235 * Fix #14237 * Fix #14234 * Use octicon to show private status of repo in admin dashboard * Fix #14232 * Fix #14236tags/v1.15.0-dev
@@ -22,7 +22,6 @@ | |||
{{.i18n.Tr "admin.repos.name"}} | |||
{{SortArrow "alphabetically" "reversealphabetically" $.SortType false}} | |||
</th> | |||
<th>{{.i18n.Tr "admin.repos.private"}}</th> | |||
<th>{{.i18n.Tr "admin.repos.watches"}}</th> | |||
<th data-sortt-asc="moststars" data-sortt-desc="feweststars"> | |||
{{.i18n.Tr "admin.repos.stars"}} | |||
@@ -51,8 +50,12 @@ | |||
<span class="text gold">{{svg "octicon-lock"}}</span> | |||
{{end}} | |||
</td> | |||
<td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td> | |||
<td>{{if .IsPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td> | |||
<td> | |||
<a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a> | |||
{{if .IsPrivate}} | |||
<span class="text gold">{{svg "octicon-lock"}}</span> | |||
{{end}} | |||
</td> | |||
<td>{{.NumWatches}}</td> | |||
<td>{{.NumStars}}</td> | |||
<td>{{.NumForks}}</td> |
@@ -12,7 +12,7 @@ | |||
<span class="header"> | |||
<a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}} | |||
{{if .Visibility.IsPrivate}} | |||
<span class="text gold">{{svg "octicon-lock"}}</span> | |||
<span class="ui basic label">{{$.i18n.Tr "repo.desc.private"}}</span> | |||
{{end}} | |||
</span> | |||
<div class="description"> |
@@ -15,7 +15,9 @@ | |||
{{$.i18n.Tr "settings.revoke_key"}} | |||
</button> | |||
</div> | |||
{{svg "octicon-key"}} | |||
<div class="left floated content"> | |||
{{svg "octicon-key"}} | |||
</div> | |||
<div class="content"> | |||
<strong>{{$grant.Application.Name}}</strong> | |||
<div class="activity meta"> |
@@ -1556,10 +1556,13 @@ a.ui.label:hover { | |||
.ui.button { | |||
background: var(--color-button); | |||
border: 1px solid var(--color-light-border); | |||
box-shadow: none !important; | |||
color: var(--color-text); | |||
} | |||
.page-content .ui.button { | |||
box-shadow: none !important; | |||
} | |||
.ui.button:hover { | |||
background: var(--color-hover); | |||
color: var(--color-text); |
@@ -111,6 +111,7 @@ | |||
.issue.title { | |||
width: 80%; | |||
margin: 0 0 1em; | |||
} | |||
.push.news .content ul { |
@@ -1475,7 +1475,7 @@ | |||
} | |||
} | |||
.diff-box .header { | |||
.diff-box .header:not(.resolved-placeholder) { | |||
display: flex; | |||
align-items: center; | |||
@@ -1493,6 +1493,15 @@ | |||
} | |||
} | |||
.diff-box .resolved-placeholder { | |||
display: flex; | |||
align-items: center; | |||
.button { | |||
padding: 8px 12px; | |||
} | |||
} | |||
.diff-file-box { | |||
margin-top: 1rem; | |||
margin-bottom: 1rem; | |||
@@ -2697,7 +2706,12 @@ tbody.commit-list { | |||
.commit-body { | |||
white-space: pre-wrap; | |||
margin: 0; | |||
} | |||
.repository:not(.diff) { | |||
.commit-body { | |||
margin: 0; | |||
} | |||
} | |||
.git-notes.top { |