From f82f71c4bf54be1df435b4b6f5c7bb4c12467600 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 8 May 2023 08:16:29 +0000 Subject: [PATCH 1/2] add --- templates/projects/view.tmpl | 4 ++-- web_src/css/features/projects.css | 5 ++++- web_src/js/features/repo-projects.js | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 705ce52d6c5b..270fad9c8f68 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -73,7 +73,7 @@
-
+
{{range $board := .Boards}}
@@ -182,7 +182,7 @@ {{range (index $.IssuesMap .ID)}} -
+
{{if eq $.Project.CardType 1}}{{/* Images and Text*/}}
{{range (index $.issuesAttachmentMap .ID)}} diff --git a/web_src/css/features/projects.css b/web_src/css/features/projects.css index 2bc68ccf0dc1..a1a791424556 100644 --- a/web_src/css/features/projects.css +++ b/web_src/css/features/projects.css @@ -80,12 +80,15 @@ .board-card { margin: 4px 2px !important; border-radius: 5px !important; - cursor: move; width: calc(100% - 4px) !important; padding: 0.5rem !important; min-height: auto !important; } +.board-card.sortable { + cursor: move; +} + .board-card .meta * { margin-right: 0 !important; } diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js index 5d4009622057..ded9d8246078 100644 --- a/web_src/js/features/repo-projects.js +++ b/web_src/js/features/repo-projects.js @@ -36,7 +36,7 @@ function moveIssue({item, from, to, oldIndex}) { } async function initRepoProjectSortable() { - const els = document.querySelectorAll('#project-board > .board'); + const els = document.querySelectorAll('#project-board > .board.sortable'); if (!els.length) return; const {Sortable} = await import(/* webpackChunkName: "sortable" */'sortablejs'); From 7c4fd652429484e8061702a745314e7d52010cf1 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 9 May 2023 00:52:15 +0000 Subject: [PATCH 2/2] improve --- templates/projects/view.tmpl | 2 +- web_src/css/features/projects.css | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 270fad9c8f68..3274463435de 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -182,7 +182,7 @@ {{range (index $.IssuesMap .ID)}} -
+
{{if eq $.Project.CardType 1}}{{/* Images and Text*/}}
{{range (index $.issuesAttachmentMap .ID)}} diff --git a/web_src/css/features/projects.css b/web_src/css/features/projects.css index a1a791424556..bd48429fa6c2 100644 --- a/web_src/css/features/projects.css +++ b/web_src/css/features/projects.css @@ -6,6 +6,10 @@ margin: 0 0.5em; } +.board.sortable .board-card { + cursor: move; +} + .board-column { background-color: var(--color-project-board-bg) !important; border: 1px solid var(--color-secondary) !important; @@ -85,10 +89,6 @@ min-height: auto !important; } -.board-card.sortable { - cursor: move; -} - .board-card .meta * { margin-right: 0 !important; }