Skip to content

Commit 6c1cb2a

Browse files
denyskondenyskon
committed
fix shared styles, additional fixes
1 parent 46ff4ae commit 6c1cb2a

File tree

6 files changed

+38
-79
lines changed

6 files changed

+38
-79
lines changed

‎templates/package/shared/list.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
</form>
1515
<div class="ui {{if .PackageDescriptors}}issue list{{end}}">
1616
{{range .PackageDescriptors}}
17-
<li class="item gt-df gt-py-3">
17+
<li class="item">
1818
<div class="issue-item-main">
19-
<div class="issue-item-top-row">
19+
<div class="issue-item-title">
2020
<a class="title" href="{{.FullWebLink}}">{{.Package.Name}}</a>
2121
<span class="ui label">{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}</span>
2222
</div>
23-
<div class="desc issue-item-bottom-row">
23+
<div class="issue-item-body">
2424
{{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}}
2525
{{$hasRepositoryAccess := false}}
2626
{{if .Repository}}

‎templates/package/shared/versionlist.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
</form>
2121
<div class="ui {{if .PackageDescriptors}}issue list{{end}}">
2222
{{range .PackageDescriptors}}
23-
<li class="item gt-df gt-py-3">
23+
<li class="item">
2424
<div class="issue-item-main">
25-
<div class="issue-item-top-row">
25+
<div class="issue-item-title">
2626
<a class="title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a>
2727
</div>
28-
<div class="desc issue-item-bottom-row">
28+
<div class="issue-item-body">
2929
{{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
3030
</div>
3131
</div>

‎templates/repo/actions/runs_list.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
</div>
77
{{end}}
88
{{range .Runs}}
9-
<li class="item gt-df gt-py-3">
10-
<div class="issue-item-left issue-item-icon gt-df gt-items-start">
9+
<li class="item action-item">
10+
<div class="issue-item-left issue-item-icon">
1111
{{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
1212
</div>
1313
<div class="issue-item-main action-item-main">
14-
<div class="issue-item-top-row">
14+
<div class="issue-item-title">
1515
<a class="index gt-no-underline title action-item-title" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
1616
{{- .Title -}}
1717
</a>
1818
</div>
19-
<div class="desc issue-item-bottom-row">
19+
<div class="issue-item-body">
2020
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>
2121
: {{$.locale.Tr "actions.runs.commit"}}
2222
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>
@@ -32,8 +32,8 @@
3232
{{end}}
3333
</div>
3434
<div class="action-item-right">
35-
<div>{{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}</div>
36-
<div>{{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}</div>
35+
<div class="flex-text-block">{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated $.locale}}</div>
36+
<div class="flex-text-block">{{svg "octicon-stopwatch" 16}}{{.Duration}}</div>
3737
</div>
3838
</li>
3939
{{end}}

‎templates/repo/issue/labels/edit_delete_label.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</div>
3131
<br>
3232
<small class="desc">{{.locale.Tr "repo.issues.label_exclusive_desc" | Safe}}</small>
33-
<div class="desc gt-ml-2 gt-mt-3 gt-hidden label-exclusive-warning">
33+
<div class="gt-ml-2 gt-mt-3 gt-hidden label-exclusive-warning">
3434
{{svg "octicon-alert"}} {{.locale.Tr "repo.issues.label_exclusive_warning" | Safe}}
3535
</div>
3636
</div>

‎templates/shared/issuelist.tmpl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
{{template "shared/issueicon" .}}
1111
</div>
1212
</div>
13-
<div class="issue-item-block">
13+
<div class="issue-item-main">
1414
<div class="issue-item-header">
15-
<div class="issue-item-top-row">
15+
<div class="issue-item-title">
1616
<a class="title gt-no-underline issue-title" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">{{RenderEmoji $.Context .Title | RenderCodeBlock}}</a>
1717
{{if .IsPull}}
1818
{{if (index $.CommitStatuses .PullRequest.ID)}}
@@ -26,15 +26,15 @@
2626
</span>
2727
</div>
2828
{{if or .TotalTrackedTime .Assignees .NumComments}}
29-
<div class="issue-item-icons-right gt-df gt-p-2">
29+
<div class="issue-item-right">
3030
{{if .TotalTrackedTime}}
31-
<div class="issue-item-icon-right text grey flex-text-block">
32-
{{svg "octicon-clock" 16 }}
31+
<div class="text grey flex-text-block">
32+
{{svg "octicon-clock" 16}}
3333
{{.TotalTrackedTime | Sec2Time}}
3434
</div>
3535
{{end}}
3636
{{if .Assignees}}
37-
<div class="issue-item-icon-right text grey">
37+
<div class="text grey">
3838
{{range .Assignees}}
3939
<a class="ui assignee gt-no-underline" href="{{.HomeLink}}" data-tooltip-content="{{.GetDisplayName}}">
4040
{{avatar $.Context . 20}}
@@ -43,16 +43,16 @@
4343
</div>
4444
{{end}}
4545
{{if .NumComments}}
46-
<div class="issue-item-icon-right text grey">
46+
<div class="text grey">
4747
<a class="gt-no-underline muted flex-text-inline" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
48-
{{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}}
48+
{{svg "octicon-comment" 16}}{{.NumComments}}
4949
</a>
5050
</div>
5151
{{end}}
5252
</div>
5353
{{end}}
5454
</div>
55-
<div class="desc issue-item-bottom-row">
55+
<div class="issue-item-body">
5656
<a class="index" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
5757
{{if eq $.listType "dashboard"}}
5858
{{.Repo.FullName}}#{{.Index}}

‎web_src/css/shared/issuelist.css

Lines changed: 16 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
align-items: start;
1515
}
1616

17-
.issue.list .item .issue-item-block {
17+
.issue.list .item .issue-item-main {
1818
display: flex;
1919
flex-direction: column;
2020
width: 100%;
@@ -36,14 +36,13 @@
3636
margin-top: 1px;
3737
}
3838

39-
.issue.list > .item .issue-item-icons-right > * + * {
40-
margin-left: 0.5rem;
39+
.issue.list .item .issue-item-right {
40+
display: flex;
41+
gap: 0.5rem;
4142
}
4243

43-
.issue.list > .item .issue-item-main {
44-
flex: 1;
45-
display: flex;
46-
flex-direction: column;
44+
.issue.list > .action-item {
45+
align-items: normal;
4746
}
4847

4948
.issue.list > .item .action-item-center {
@@ -61,15 +60,15 @@
6160
color: var(--color-text-light);
6261
}
6362

64-
.issue.list > .item .issue-item-top-row {
63+
.issue.list > .item .issue-item-title {
6564
max-width: 100%;
6665
color: var(--color-text);
6766
font-size: 16px;
6867
min-width: 0;
6968
font-weight: var(--font-weight-semibold);
7069
}
7170

72-
.issue.list > .item .issue-item-top-row a.index {
71+
.issue.list > .item .issue-item-title a.index {
7372
max-width: fit-content;
7473
display: -webkit-box;
7574
-webkit-box-orient: vertical;
@@ -78,81 +77,41 @@
7877
word-break: break-all;
7978
}
8079

81-
.issue.list > .item .labels-list {
82-
position: relative;
83-
top: -1.5px;
80+
.issue.list > .item .title {
81+
color: var(--color-text);
82+
word-break: break-word;
8483
}
8584

86-
.issue.list > .item .issue-item-bottom-row {
85+
.issue.list > .item .issue-item-body {
8786
font-size: 13px;
8887
display: flex;
8988
align-items: center;
9089
flex-wrap: wrap;
9190
gap: .25rem;
92-
}
93-
94-
.issue.list > .item .title {
95-
color: var(--color-text);
96-
word-break: break-word;
97-
}
98-
99-
.issue.list > .item .issue-item-icon-right {
100-
min-width: 2rem;
101-
}
102-
103-
.issue.list > .item .assignee {
104-
position: relative;
105-
top: -2px;
106-
}
107-
108-
.issue.list > .item .assignee img {
109-
margin-right: 2px;
110-
}
111-
112-
.issue.list > .item .desc {
11391
color: var(--color-text-light-2);
11492
}
11593

116-
.issue.list > .item .desc a {
94+
.issue.list > .item .issue-item-body a {
11795
color: inherit;
11896
word-break: break-word;
11997
}
12098

121-
.issue.list > .item .desc .waiting,
122-
.issue.list > .item .desc .approvals,
123-
.issue.list > .item .desc .rejects {
124-
padding-left: 5px;
125-
}
126-
127-
.issue.list > .item .desc .checklist {
128-
padding-left: 5px;
129-
}
130-
131-
.issue.list > .item .desc .checklist progress {
99+
.issue.list > .item .issue-item-body .checklist progress {
132100
margin-left: 2px;
133101
width: 80px;
134102
height: 6px;
135103
display: inline-block;
136104
border-radius: 3px;
137-
vertical-align: 2px !important;
138105
}
139106

140-
.issue.list > .item .desc .checklist progress::-webkit-progress-value {
107+
.issue.list > .item .issue-item-body .checklist progress::-webkit-progress-value {
141108
background-color: var(--color-secondary-dark-4);
142109
}
143110

144-
.issue.list > .item .desc .checklist progress::-moz-progress-bar {
111+
.issue.list > .item .issue-item-body .checklist progress::-moz-progress-bar {
145112
background-color: var(--color-secondary-dark-4);
146113
}
147114

148-
.issue.list > .item .desc .conflicting {
149-
padding-left: 5px;
150-
}
151-
152-
.issue.list > .item .desc .due-date {
153-
padding-left: 5px;
154-
}
155-
156115
.issue.list .branches {
157116
display: inline-flex;
158117
}

0 commit comments

Comments
 (0)