Skip to content
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

Various UI fixes #25264

Merged
merged 4 commits into from
Jun 22, 2023
Merged

Various UI fixes #25264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f418e14
Various UI fixes
silverwind Jun 14, 2023
7f37f64
Merge branch 'main' into uitweaks2
silverwind Jun 16, 2023
e9a5783
Merge remote-tracking branch 'origin/main' into uitweaks2
silverwind Jun 21, 2023
b483ad8
tweak overdue, remove the extra class
silverwind Jun 21, 2023
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
2 changes: 1 addition & 1 deletion templates/admin/notice.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h4 class="ui top attached header">
{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
</h4>
<table class="ui attached basic select selectable table unstackable g-table-auto-ellipsis">
<table class="ui attached segment select selectable striped table unstackable g-table-auto-ellipsis">
<thead>
<tr>
<th></th>
Expand Down
2 changes: 1 addition & 1 deletion templates/projects/view.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</div>
{{if $.CanWriteProjects}}
<div class="column right aligned">
<div class="ui compact right small menu">
<div class="ui compact right mini menu">
<a class="item" href="{{$.Link}}/edit?redirect=project">
{{svg "octicon-pencil"}}
<span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span>
Expand Down
8 changes: 6 additions & 2 deletions templates/repo/issue/milestone_issues.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,14 @@
{{if .IsClosed}}
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
{{else}}
{{svg "octicon-calendar"}}

{{if .Milestone.DeadlineString}}
<span {{if .IsOverdue}}class="overdue"{{end}}>{{DateTime "short" .Milestone.DeadlineString}}</span>
<span{{if .IsOverdue}} class="text red"{{end}}>
{{svg "octicon-calendar"}}
{{DateTime "short" .Milestone.DeadlineString}}
</span>
{{else}}
{{svg "octicon-calendar"}}
{{$.locale.Tr "repo.milestones.no_due_date"}}
{{end}}
{{end}}
Expand Down
5 changes: 3 additions & 2 deletions templates/repo/issue/milestones.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,13 @@
{{svg "octicon-clock" 14}}
{{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
{{else}}
{{svg "octicon-calendar" 14}}
{{if .DeadlineString}}
<span {{if .IsOverdue}}class="overdue"{{end}}>
<span{{if .IsOverdue}} class="text red"{{end}}>
{{svg "octicon-calendar" 14}}
{{DateTime "short" .DeadlineString}}
</span>
{{else}}
{{svg "octicon-calendar" 14}}
{{$.locale.Tr "repo.milestones.no_due_date"}}
{{end}}
{{end}}
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/projects/view.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</div>
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
<div class="column right aligned">
<div class="ui compact right small menu">
<div class="ui compact right mini menu">
<a class="item" href="{{$.RepoLink}}/projects/{{.Project.ID}}/edit?redirect=project">
{{svg "octicon-pencil"}}
<span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span>
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/view_list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<tbody>
{{if .HasParentPath}}
<tr class="has-parent">
<td colspan="3">{{svg "octicon-reply"}}<a href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">..</a></td>
<td colspan="3">{{svg "octicon-reply"}}<a class="muted" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">..</a></td>
</tr>
{{end}}
{{range $item := .Files}}
Expand Down
2 changes: 1 addition & 1 deletion templates/shared/issuelist.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
{{end}}
{{if ne .DeadlineUnix 0}}
<span class="due-date" data-tooltip-content="{{$.locale.Tr "repo.issues.due_date"}}">
<span{{if .IsOverdue}} class="overdue"{{end}}>
<span{{if .IsOverdue}} class="text red"{{end}}>
{{svg "octicon-calendar" 14 "gt-mr-2"}}
{{DateTime "short" .DeadlineUnix}}
</span>
Expand Down
5 changes: 3 additions & 2 deletions templates/user/dashboard/milestones.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,13 @@
{{svg "octicon-clock" 14}}
{{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
{{else}}
{{svg "octicon-calendar" 14}}
{{if .DeadlineString}}
<span {{if .IsOverdue}}class="overdue"{{end}}>
<span{{if .IsOverdue}} class="text red"{{end}}>
{{svg "octicon-calendar" 14}}
{{DateTime "short" .DeadlineString}}
</span>
{{else}}
{{svg "octicon-calendar" 14}}
{{$.locale.Tr "repo.milestones.no_due_date"}}
{{end}}
{{end}}
Expand Down
6 changes: 3 additions & 3 deletions templates/user/settings/organization.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
</button>
</form>
</div>
{{avatar $.Context . 28 "mini"}}
<div class="content">
<a href="{{.HomeLink}}">{{.Name}}</a>
<div class="content gt-df gt-ac gt-gap-3">
{{avatar $.Context . 28 "mini"}}
<a class="muted" href="{{.HomeLink}}">{{.Name}}</a>
</div>
</div>
{{end}}
Expand Down
4 changes: 2 additions & 2 deletions templates/user/settings/repos.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
{{else}}
<span class="icon">{{svg "octicon-repo"}}</span>
{{end}}
<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
<span>{{FileSize $repo.Size}}</span>
<a class="muted name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
<span class="text light-3">{{FileSize $repo.Size}}</span>
{{if $repo.IsFork}}
{{$.locale.Tr "repo.forked_from"}}
<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
Expand Down
7 changes: 7 additions & 0 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,13 @@ a.label,
border-color: var(--color-secondary);
}

.ui.table > tfoot > tr > th,
.ui.table > tfoot > tr > td {
border-color: var(--color-secondary);
background: var(--color-box-body);
color: var(--color-text);
}

img.ui.avatar,
.ui.avatar img,
.ui.avatar svg {
Expand Down
4 changes: 0 additions & 4 deletions web_src/css/repo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1947,10 +1947,6 @@
line-height: 2em;
}

.repository.settings.collaboration .collaborator.list > .item:not(:last-child) {
border-bottom: 1px solid var(--color-secondary);
}

.repository.settings.collaboration #repo-collab-form #search-user-box .results {
left: 7px;
}
Expand Down
4 changes: 0 additions & 4 deletions web_src/css/shared/issuelist.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@
margin-right: -4px;
}

.issue.list > .item .desc .overdue {
color: var(--color-red);
}

.issue.list .branches {
display: inline-flex;
padding: 0 4px;
Expand Down
4 changes: 0 additions & 4 deletions web_src/css/shared/milestone.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
gap: 8px;
}

.milestone-toolbar .group .overdue {
color: var(--color-red);
}

.milestone-toolbar .group > a {
font-size: 15px;
color: var(--color-text-light-2);
Expand Down