diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index e5742157d8..80ccecbce1 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -80,6 +80,7 @@ milestones = Milestones ok = OK cancel = Cancel rerun = Re-run +rerun_all = Re-run all jobs save = Save add = Add add_all = Add All diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl index ab2ee8482c..cdc747aa8b 100644 --- a/templates/repo/actions/status.tmpl +++ b/templates/repo/actions/status.tmpl @@ -1,5 +1,6 @@ {{- $size := 16 -}} {{- if .size -}} @@ -11,7 +12,7 @@ {{- $className = .className -}} {{- end -}} - + {{if eq .status "success"}} {{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}} {{else if eq .status "skipped"}} @@ -22,7 +23,7 @@ {{svg "octicon-blocked" $size (printf "text yellow %s" $className)}} {{else if eq .status "running"}} {{svg "octicon-meter" $size (printf "text yellow job-status-rotate %s" $className)}} -{{else}} +{{else if or (eq .status "failure") or (eq .status "cancelled") or (eq .status "unknown")}} {{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}} {{end}} diff --git a/templates/repo/actions/view.tmpl b/templates/repo/actions/view.tmpl index 8d6559ee98..3a3a069cbc 100644 --- a/templates/repo/actions/view.tmpl +++ b/templates/repo/actions/view.tmpl @@ -9,6 +9,7 @@ data-locale-approve="{{.locale.Tr "repo.diff.review.approve"}}" data-locale-cancel="{{.locale.Tr "cancel"}}" data-locale-rerun="{{.locale.Tr "rerun"}}" + data-locale-rerun-all="{{.locale.Tr "rerun_all"}}" data-locale-status-unknown="{{.locale.Tr "actions.status.unknown"}}" data-locale-status-waiting="{{.locale.Tr "actions.status.waiting"}}" data-locale-status-running="{{.locale.Tr "actions.status.running"}}" diff --git a/web_src/css/base.css b/web_src/css/base.css index eb12ffef7a..4b9f1eef22 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -71,6 +71,7 @@ /* console colors */ --color-console-fg: #ffffff; --color-console-bg: #171717; + --color-console-hover-bg: #ffffff16; /* named colors */ --color-red: #db2828; --color-orange: #f2711c; diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue index 0786cb60a9..bddf307a1b 100644 --- a/web_src/js/components/ActionRunStatus.vue +++ b/web_src/js/components/ActionRunStatus.vue @@ -1,14 +1,15 @@ diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 28adfbc6ec..b2fd63dd18 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -1,28 +1,30 @@