Skip to content

Various UI fixes #14239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 4, 2021
Merged

Various UI fixes #14239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e88b9d
Fix #14238
CirnoT Jan 4, 2021
40606ae
Fix #14235
CirnoT Jan 4, 2021
37c01b1
Fix #14237
CirnoT Jan 4, 2021
1dd9ad5
Fix #14234
CirnoT Jan 4, 2021
69553c0
Use octicon to show private status of repo in admin dashboard
CirnoT Jan 4, 2021
9d5f5a6
Fix #14232
CirnoT Jan 4, 2021
2da8afe
Fix #14236
CirnoT Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions templates/admin/repo/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion templates/explore/organizations.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 3 additions & 1 deletion templates/user/settings/grants_oauth2.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 4 additions & 1 deletion web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions web_src/less/_dashboard.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@

.issue.title {
width: 80%;
margin: 0 0 1em;
}

.push.news .content ul {
Expand Down
18 changes: 16 additions & 2 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@
}
}

.diff-box .header {
.diff-box .header:not(.resolved-placeholder) {
display: flex;
align-items: center;

Expand All @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down