Skip to content

Commit d9c97d6

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent b9961e1 commit d9c97d6

3 files changed

Lines changed: 45 additions & 51 deletions

File tree

‎templates/repo/actions/list.tmpl‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,49 +25,49 @@
2525
</div>
2626
</div>
2727
<div class="flex-container-main">
28-
<div class="ui top attached header tw-flex tw-items-center tw-justify-between">
29-
<span class="tw-text-base tw-font-semibold">{{ctx.Locale.TrN .Page.Paginater.Total "actions.runs.workflow_run_count_1" "actions.runs.workflow_run_count_n" .Page.Paginater.Total}}</span>
30-
<div class="ui secondary filter menu tw-flex tw-items-center tw-m-0">
31-
<!-- Actor -->
32-
<div class="ui{{if not .Actors}} disabled{{end}} dropdown jump item">
33-
<span class="text">{{ctx.Locale.Tr "actions.runs.actor"}}</span>
34-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
35-
<div class="menu">
36-
<div class="ui icon search input">
37-
<i class="icon">{{svg "octicon-search"}}</i>
38-
<input type="text" placeholder="{{ctx.Locale.Tr "actions.runs.actor"}}">
39-
</div>
40-
<a class="item{{if not $.CurActor}} active{{end}}" href="?workflow={{$.CurWorkflow}}&status={{$.CurStatus}}&actor=0">
41-
{{ctx.Locale.Tr "actions.runs.actors_no_select"}}
42-
</a>
43-
{{range .Actors}}
44-
<a class="item{{if eq .ID $.CurActor}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{.ID}}&status={{$.CurStatus}}">
45-
{{ctx.AvatarUtils.Avatar . 20}} {{.GetDisplayName}}
28+
<div class="ui top attached header flex-text-block tw-flex-wrap tw-justify-between">
29+
<strong>{{ctx.Locale.TrN .Page.Paginater.Total "actions.runs.workflow_run_count_1" "actions.runs.workflow_run_count_n" .Page.Paginater.Total}}</strong>
30+
<div class="ui secondary filter menu flex-text-block tw-m-0">
31+
<!-- Actor -->
32+
<div class="ui{{if not .Actors}} disabled{{end}} dropdown jump item">
33+
<span class="text">{{ctx.Locale.Tr "actions.runs.actor"}}</span>
34+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
35+
<div class="menu">
36+
<div class="ui icon search input">
37+
<i class="icon">{{svg "octicon-search"}}</i>
38+
<input type="text" placeholder="{{ctx.Locale.Tr "actions.runs.actor"}}">
39+
</div>
40+
<a class="item{{if not $.CurActor}} active{{end}}" href="?workflow={{$.CurWorkflow}}&status={{$.CurStatus}}&actor=0">
41+
{{ctx.Locale.Tr "actions.runs.actors_no_select"}}
4642
</a>
47-
{{end}}
48-
</div>
49-
</div>
50-
<!-- Status -->
51-
<div class="ui dropdown jump item">
52-
<span class="text">{{ctx.Locale.Tr "actions.runs.status"}}</span>
53-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
54-
<div class="menu">
55-
<div class="ui icon search input">
56-
<i class="icon">{{svg "octicon-search"}}</i>
57-
<input type="text" placeholder="{{ctx.Locale.Tr "actions.runs.status"}}">
43+
{{range .Actors}}
44+
<a class="item{{if eq .ID $.CurActor}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{.ID}}&status={{$.CurStatus}}">
45+
{{ctx.AvatarUtils.Avatar . 20}} {{.GetDisplayName}}
46+
</a>
47+
{{end}}
5848
</div>
59-
<a class="item{{if not $.CurStatus}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status=0">
60-
{{ctx.Locale.Tr "actions.runs.status_no_select"}}
61-
</a>
62-
{{range .StatusInfoList}}
63-
<a class="item{{if eq .Status $.CurStatus}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status={{.Status}}">
64-
{{.DisplayedStatus}}
49+
</div>
50+
<!-- Status -->
51+
<div class="ui dropdown jump item">
52+
<span class="text">{{ctx.Locale.Tr "actions.runs.status"}}</span>
53+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
54+
<div class="menu">
55+
<div class="ui icon search input">
56+
<i class="icon">{{svg "octicon-search"}}</i>
57+
<input type="text" placeholder="{{ctx.Locale.Tr "actions.runs.status"}}">
58+
</div>
59+
<a class="item{{if not $.CurStatus}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status=0">
60+
{{ctx.Locale.Tr "actions.runs.status_no_select"}}
6561
</a>
66-
{{end}}
62+
{{range .StatusInfoList}}
63+
<a class="item{{if eq .Status $.CurStatus}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status={{.Status}}">
64+
{{.DisplayedStatus}}
65+
</a>
66+
{{end}}
67+
</div>
6768
</div>
68-
</div>
6969

70-
{{if .AllowDisableOrEnableWorkflow}}
70+
{{if .AllowDisableOrEnableWorkflow}}
7171
<button class="ui jump dropdown btn interact-bg tw-p-2">
7272
{{svg "octicon-kebab-horizontal"}}
7373
<div class="menu">
@@ -76,7 +76,7 @@
7676
</a>
7777
</div>
7878
</button>
79-
{{end}}
79+
{{end}}
8080
</div>
8181
</div>
8282

‎templates/repo/actions/workflow_dispatch.tmpl‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
<div class="ui blue info attached message tw-relative tw-z-10 tw-flex tw-justify-between tw-items-center">
2-
<span class="ui text middle">{{ctx.Locale.Tr "actions.workflow.has_workflow_dispatch"}}</span>
3-
<button class="ui mini button show-modal" data-modal="#runWorkflowDispatchModal">{{ctx.Locale.Tr "actions.workflow.run"}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}</button>
1+
{{/* to maintain continuous attached styling and keep the colored border-bottom visible (pre-existing fomantic issue with negative margins) */}}
2+
<div class="ui blue info attached message flex-text-block tw-flex-wrap tw-justify-between tw-z-1">
3+
<span>{{ctx.Locale.Tr "actions.workflow.has_workflow_dispatch"}}</span>
4+
<div class="flex-text-block tw-bg-box-body tw-rounded">{{/*make the button have correct hovered color */}}
5+
<button class="ui mini button show-modal" data-modal="#runWorkflowDispatchModal">{{ctx.Locale.Tr "actions.workflow.run"}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}</button>
6+
</div>
47
</div>
58
<div id="runWorkflowDispatchModal" class="ui tiny modal">
69
<div class="content">

‎web_src/css/modules/message.css‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@
8484
border-color: var(--color-warning-border);
8585
}
8686

87-
/* use opaque colors for buttons inside colored messages */
88-
.ui.message .ui.button:hover {
89-
background: var(--color-secondary);
90-
}
91-
92-
.ui.message .ui.button:active {
93-
background: var(--color-secondary-hover);
94-
}
95-
9687
.ui.message > .close.icon {
9788
cursor: pointer;
9889
position: absolute;

0 commit comments

Comments
 (0)