From 3f9410f28c61d581b4749c97ebdf6c0f75009214 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Thu, 27 Jan 2022 14:58:08 +0800 Subject: [PATCH] *Fix bug for card. --- module/kanban/css/view.css | 2 +- module/kanban/js/view.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index da88efa200..5d8bd839a6 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -115,5 +115,5 @@ .region .kanban-item > .kanban-card > .execInfo > .user, .region .kanban-item > .kanban-card > .releaseInfo > .user, .region .kanban-item > .kanban-card > .productplanInfo > .user {position: absolute; right: 13px; bottom: 1px} .region .kanban-item > .kanban-card > .execInfo > .user > .avatar, .region .kanban-item > .kanban-card > .releaseInfo > .user > .avatar, .region .kanban-item > .kanban-card > .productplanInfo > .user > .avatar {display: inline-block; width: 24px; height: 24px; line-height: 24px; margin-right: 0px; margin-left: 2px} .kanban-card .releaseTitle .icon, .kanban-card .title .icon, .kanban-card .productplanTitle .icon, .kanban-card .title .icon, .kanban-card .buildTitle .icon{padding-right: 5px;} -.kanban-card .label{margin-right: 7px; float: left; background-color:#2a5f29;} +.kanban-card .label-finish {margin-right: 7px; margin-top: -1px; float: left; background-color:#2a5f29;} .kanban-card .releaseTitle, .kanban-card .productplanTitle {width: 100%; float: left;} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index a6e60404d3..dfed5caaf7 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -306,7 +306,7 @@ function renderKanbanItem(item, $item) if(privs.includes('sortCard')) $item.parent().addClass('sort'); if(!$title.length) { - $('
' + kanbanLang.finished + '
').appendTo($item); + $('
' + kanbanLang.finished + '
').appendTo($item); if(privs.includes('viewCard')) $title = $('').appendTo($item).attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true)); if(!privs.includes('viewCard')) $title = $('

').appendTo($item); } @@ -317,20 +317,20 @@ function renderKanbanItem(item, $item) var finishColor = '#2a5f29'; if(item.color == '#2a5f29') finishColor = '#FFFFFF'; $title.text(item.name).css('color', finishColor); - $item.children('.label').show(); + $item.children('.label-finish').show(); if(item.color == '#2a5f29') { - $item.children('.label').css({'background-color':'#FFFFFF','color':'#2a5f29'}); + $item.children('.label-finish').css({'background-color':'#FFFFFF','color':'#2a5f29'}); } else { - $item.children('.label').css({'background-color':'','color':''}); + $item.children('.label-finish').css({'background-color':'','color':'#FFFFFF'}); } } else { $title.text(item.name).css('color', ''); - $item.children('.label').hide(); + $item.children('.label-finish').hide(); } var $actions = $item.children('.actions');