From 4e6025a5dd0dc00fc68cea4a5ced9b2c17498e86 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Mon, 7 Apr 2025 11:27:58 +0800 Subject: [PATCH 1/8] Update ViewFileTreeItem.vue --- web_src/js/components/ViewFileTreeItem.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue index 69e26dbc33a15..96608d3d0f066 100644 --- a/web_src/js/components/ViewFileTreeItem.vue +++ b/web_src/js/components/ViewFileTreeItem.vue @@ -58,7 +58,7 @@ const doGotoSubModule = () => { >
- + {{ item.entryName }}
@@ -70,7 +70,7 @@ const doGotoSubModule = () => { >
- + {{ item.entryName }}
@@ -83,7 +83,7 @@ const doGotoSubModule = () => {
- + {{ item.entryName }}
@@ -101,7 +101,7 @@ const doGotoSubModule = () => {
- + {{ item.entryName }}
@@ -158,4 +158,8 @@ const doGotoSubModule = () => { text-overflow: ellipsis; min-width: 0; } + +.item-content .content { + display: contents; +} From 2b15fdd46b35bb20d90e2f1c5ab8aa4c31e84367 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Mon, 7 Apr 2025 05:47:51 +0000 Subject: [PATCH 2/8] fix --- web_src/css/base.css | 11 +++++++++++ web_src/css/repo/home-file-list.css | 11 ----------- web_src/js/components/ViewFileTreeItem.vue | 12 +++++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index de656c0d958cd..e52ec986d017e 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1181,3 +1181,14 @@ the "!important" is necessary to override Fomantic UI menu item styles, meanwhil flex-grow: 1; justify-content: space-between; } + +.svg.octicon-file-directory-fill, +.svg.octicon-file-submodule { + color: var(--color-primary); +} + +.svg.octicon-file, +.svg.octicon-file-symlink-file, +.svg.octicon-file-directory-symlink { + color: var(--color-secondary-dark-7); +} diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index 46128457ede6a..f2ab052a54cf2 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -14,17 +14,6 @@ } } -#repo-files-table .svg.octicon-file-directory-fill, -#repo-files-table .svg.octicon-file-submodule { - color: var(--color-primary); -} - -#repo-files-table .svg.octicon-file, -#repo-files-table .svg.octicon-file-symlink-file, -#repo-files-table .svg.octicon-file-directory-symlink { - color: var(--color-secondary-dark-7); -} - #repo-files-table .repo-file-item { display: contents; } diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue index 96608d3d0f066..14442d0bb6972 100644 --- a/web_src/js/components/ViewFileTreeItem.vue +++ b/web_src/js/components/ViewFileTreeItem.vue @@ -58,7 +58,8 @@ const doGotoSubModule = () => { >
- + + {{ item.entryName }}
@@ -70,7 +71,8 @@ const doGotoSubModule = () => { >
- + + {{ item.entryName }}
@@ -83,7 +85,7 @@ const doGotoSubModule = () => {
- + {{ item.entryName }}
@@ -101,7 +103,7 @@ const doGotoSubModule = () => {
- + {{ item.entryName }}
@@ -159,7 +161,7 @@ const doGotoSubModule = () => { min-width: 0; } -.item-content .content { +.item-content .contents { display: contents; } From 7008c0e2b247861fe9f499afea672c2abb3f45e5 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Mon, 7 Apr 2025 05:59:26 +0000 Subject: [PATCH 3/8] fix --- web_src/js/components/ViewFileTreeItem.vue | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue index 14442d0bb6972..7bf2de9b797d0 100644 --- a/web_src/js/components/ViewFileTreeItem.vue +++ b/web_src/js/components/ViewFileTreeItem.vue @@ -59,7 +59,7 @@ const doGotoSubModule = () => {
- + {{ item.entryName }}
@@ -72,7 +72,7 @@ const doGotoSubModule = () => {
- + {{ item.entryName }}
@@ -85,7 +85,7 @@ const doGotoSubModule = () => {
- + {{ item.entryName }}
@@ -103,7 +103,7 @@ const doGotoSubModule = () => {
- + {{ item.entryName }}
@@ -160,8 +160,4 @@ const doGotoSubModule = () => { text-overflow: ellipsis; min-width: 0; } - -.item-content .contents { - display: contents; -} From 0715057ef72095f9e865111a39c81f2715fda5fa Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Mon, 7 Apr 2025 06:58:57 +0000 Subject: [PATCH 4/8] Extract job-status-rotate to global circular-spin animation class --- templates/repo/actions/status.tmpl | 2 +- web_src/css/base.css | 10 ++++++++++ web_src/js/components/ActionRunStatus.vue | 2 +- web_src/js/components/RepoActionView.vue | 13 +------------ web_src/js/components/RepoCodeFrequency.vue | 2 +- web_src/js/components/RepoContributors.vue | 2 +- web_src/js/components/RepoRecentCommits.vue | 2 +- web_src/js/components/ViewFileTreeItem.vue | 3 +-- 8 files changed, 17 insertions(+), 19 deletions(-) diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl index 64c25433028d8..f2020bc160f69 100644 --- a/templates/repo/actions/status.tmpl +++ b/templates/repo/actions/status.tmpl @@ -16,7 +16,7 @@ {{else if eq .status "blocked"}} {{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)}} + {{svg "octicon-meter" $size (printf "text yellow circular-spin %s" $className)}} {{else}}{{/*failure, unknown*/}} {{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}} {{end}} diff --git a/web_src/css/base.css b/web_src/css/base.css index e52ec986d017e..8c60eac4449f2 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1192,3 +1192,13 @@ the "!important" is necessary to override Fomantic UI menu item styles, meanwhil .svg.octicon-file-directory-symlink { color: var(--color-secondary-dark-7); } + +.circular-spin { + animation: circular-spin-keyframes 1s linear infinite; +} + +@keyframes circular-spin-keyframes { + 100% { + transform: rotate(-360deg); + } +} diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue index 487d2460cc8f1..bc3b99ab893e3 100644 --- a/web_src/js/components/ActionRunStatus.vue +++ b/web_src/js/components/ActionRunStatus.vue @@ -24,7 +24,7 @@ withDefaults(defineProps<{ - + diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 640ad8341fafe..839083633860e 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -574,7 +574,7 @@ export default defineComponent({ - + @@ -895,17 +895,6 @@ export default defineComponent({