Skip to content

Commit 327d0a7

Browse files
authored
The status icon of the Action step is consistent with GitHub (go-gitea#35618)
Before: running: <img width="45" height="34" alt="image" src="https://github.com/user-attachments/assets/e2508f98-2f1f-4b7e-a80c-30b406f42531" /> waiting: <img width="44" height="33" alt="image" src="https://github.com/user-attachments/assets/e7c8164e-fdc3-4546-b088-31166544edb0" /> --- After: running: <img width="49" height="43" alt="image" src="https://github.com/user-attachments/assets/b5a9b245-a995-458a-af23-d1723daa3692" /> waiting: <img width="42" height="44" alt="image" src="https://github.com/user-attachments/assets/ff72551e-cfb5-4665-af52-938ef0cf8f1c" /> `gitea-running.svg` is not an icon from the @ primer/octicon library, extracted from the Github page. Github did not assign a clear class name to this icon --------- Signed-off-by: 鲁汀 <[email protected]> Co-authored-by: lutinglt <[email protected]>
1 parent 165a3ea commit 327d0a7

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

public/assets/img/svg/gitea-running.svg

Lines changed: 1 addition & 0 deletions
Loading

templates/repo/actions/status.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
{{else if eq .status "cancelled"}}
1313
{{svg "octicon-stop" $size (printf "text grey %s" $className)}}
1414
{{else if eq .status "waiting"}}
15-
{{svg "octicon-clock" $size (printf "text yellow %s" $className)}}
15+
{{svg "octicon-circle" $size (printf "text grey %s" $className)}}
1616
{{else if eq .status "blocked"}}
1717
{{svg "octicon-blocked" $size (printf "text yellow %s" $className)}}
1818
{{else if eq .status "running"}}
19-
{{svg "octicon-meter" $size (printf "text yellow circular-spin %s" $className)}}
19+
{{svg "gitea-running" $size (printf "text yellow circular-spin %s" $className)}}
2020
{{else}}{{/*failure, unknown*/}}
2121
{{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}}
2222
{{end}}

web_src/js/components/ActionRunStatus.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ withDefaults(defineProps<{
2121
<span :data-tooltip-content="localeStatus ?? status" v-if="status">
2222
<SvgIcon name="octicon-check-circle-fill" class="text green" :size="size" :class="className" v-if="status === 'success'"/>
2323
<SvgIcon name="octicon-skip" class="text grey" :size="size" :class="className" v-else-if="status === 'skipped'"/>
24-
<SvgIcon name="octicon-stop" class="text yellow" :size="size" :class="className" v-else-if="status === 'cancelled'"/>
25-
<SvgIcon name="octicon-clock" class="text yellow" :size="size" :class="className" v-else-if="status === 'waiting'"/>
24+
<SvgIcon name="octicon-stop" class="text grey" :size="size" :class="className" v-else-if="status === 'cancelled'"/>
25+
<SvgIcon name="octicon-circle" class="text grey" :size="size" :class="className" v-else-if="status === 'waiting'"/>
2626
<SvgIcon name="octicon-blocked" class="text yellow" :size="size" :class="className" v-else-if="status === 'blocked'"/>
27-
<SvgIcon name="octicon-meter" class="text yellow" :size="size" :class="'circular-spin ' + className" v-else-if="status === 'running'"/>
27+
<SvgIcon name="gitea-running" class="text yellow" :size="size" :class="'circular-spin ' + className" v-else-if="status === 'running'"/>
2828
<SvgIcon name="octicon-x-circle-fill" class="text red" :size="size" v-else/><!-- failure, unknown -->
2929
</span>
3030
</template>

web_src/js/svg.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import giteaDoubleChevronLeft from '../../public/assets/img/svg/gitea-double-che
55
import giteaDoubleChevronRight from '../../public/assets/img/svg/gitea-double-chevron-right.svg';
66
import giteaEmptyCheckbox from '../../public/assets/img/svg/gitea-empty-checkbox.svg';
77
import giteaExclamation from '../../public/assets/img/svg/gitea-exclamation.svg';
8+
import giteaRunning from '../../public/assets/img/svg/gitea-running.svg';
89
import octiconArchive from '../../public/assets/img/svg/octicon-archive.svg';
910
import octiconArrowSwitch from '../../public/assets/img/svg/octicon-arrow-switch.svg';
1011
import octiconBlocked from '../../public/assets/img/svg/octicon-blocked.svg';
@@ -15,6 +16,7 @@ import octiconCheckCircleFill from '../../public/assets/img/svg/octicon-check-ci
1516
import octiconChevronDown from '../../public/assets/img/svg/octicon-chevron-down.svg';
1617
import octiconChevronLeft from '../../public/assets/img/svg/octicon-chevron-left.svg';
1718
import octiconChevronRight from '../../public/assets/img/svg/octicon-chevron-right.svg';
19+
import octiconCircle from '../../public/assets/img/svg/octicon-circle.svg';
1820
import octiconClock from '../../public/assets/img/svg/octicon-clock.svg';
1921
import octiconCode from '../../public/assets/img/svg/octicon-code.svg';
2022
import octiconColumns from '../../public/assets/img/svg/octicon-columns.svg';
@@ -84,6 +86,7 @@ const svgs = {
8486
'gitea-double-chevron-right': giteaDoubleChevronRight,
8587
'gitea-empty-checkbox': giteaEmptyCheckbox,
8688
'gitea-exclamation': giteaExclamation,
89+
'gitea-running': giteaRunning,
8790
'octicon-archive': octiconArchive,
8891
'octicon-arrow-switch': octiconArrowSwitch,
8992
'octicon-blocked': octiconBlocked,
@@ -94,6 +97,7 @@ const svgs = {
9497
'octicon-chevron-down': octiconChevronDown,
9598
'octicon-chevron-left': octiconChevronLeft,
9699
'octicon-chevron-right': octiconChevronRight,
100+
'octicon-circle': octiconCircle,
97101
'octicon-clock': octiconClock,
98102
'octicon-code': octiconCode,
99103
'octicon-columns': octiconColumns,

web_src/svg/gitea-running.svg

Lines changed: 5 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)