From 571baaccce3d3cb5afd02efc6a07038b09002813 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Thu, 23 Dec 2021 14:25:39 +0800 Subject: [PATCH] adjust card color and margin. --- module/kanban/config.php | 2 +- module/kanban/css/view.css | 4 ++-- module/kanban/lang/en.php | 6 +++--- module/kanban/lang/zh-cn.php | 6 +++--- module/kanban/view/viewarchivedcard.html.php | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/module/kanban/config.php b/module/kanban/config.php index 3ead86b83f..8ce2018009 100644 --- a/module/kanban/config.php +++ b/module/kanban/config.php @@ -101,4 +101,4 @@ $config->kanban->taskColumnStatusList['closed'] = 'closed'; $config->kanban->laneColorList = array('#7ec5ff', '#333', '#2b529c', '#e48600', '#d2323d', '#229f24', '#777', '#d2691e', '#008b8b', '#2e8b57', '#4169e1', '#4b0082', '#fa8072', '#ba55d3', '#6b8e23'); $config->kanban->columnColorList = array('#333', '#2b519c', '#e48610', '#d2313d', '#2a9f23', '#777', '#d2691e', '#2e8b8b', '#2f8b58', '#4168e0', '#4b0082', '#f58072', '#ba55d3', '#6a8e22'); -$config->kanban->cardColorList = array('#fff', '#d2323d', '#f7b501', '#278427'); +$config->kanban->cardColorList = array('#fff', '#b10b0b', '#cfa227', '#2a5f29'); diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index f9cf0a0e65..6010623f97 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -58,8 +58,8 @@ .region .kanban-item > .kanban-card > .title:hover {color: #2272eb} .region .kanban-item > .kanban-card > .info {margin-top: 5px; position: relative;} .region .kanban-item > .kanban-card > .info > .pri {height: 14px; border-width: 1px; font-size: 12px; line-height: 12px; min-width: 14px; padding: 0 1px;} -.region .kanban-item > .kanban-card > .info > .estimate{margin-left: 10px; color: #999; background-color: rgb(255, 255, 255); padding: 3px 0px} -.region .kanban-item > .kanban-card > .info > .time {margin-left: 10px; font-size: 12px; background: rgb(242, 242, 242)} +.region .kanban-item > .kanban-card > .info > .estimate{margin-left: 4px; color: #999; background-color: rgb(255, 255, 255); padding: 3px 0px} +.region .kanban-item > .kanban-card > .info > .time {margin-left: 4px; font-size: 12px; background: rgb(242, 242, 242)} .region .kanban-item > .kanban-card > .info > .user {position: absolute; right: 0; top: -2px} .region .kanban-item > .kanban-card > .info > .user > .avatar {display: inline-block; width: 24px; height: 24px; line-height: 24px; margin-right: 0px; margin-left: 2px} .region .kanban-item > .kanban-card > .info > .user > span {display: inline-block; color: transparent; width: 2px; height: 2px; background-color: #8990a2; position: sticky; border-radius: 50%; top: 3px; margin: 0 7px;} diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 0b1a27ff52..0e47d705ce 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -298,9 +298,9 @@ $lang->kanbancard->priList[3] = 3; $lang->kanbancard->priList[4] = 4; $lang->kanbancard->colorList['#fff'] = 'Default'; -$lang->kanbancard->colorList['#d2323d'] = 'Blocking'; -$lang->kanbancard->colorList['#f7b501'] = 'Warning'; -$lang->kanbancard->colorList['#278427'] = 'Urgent'; +$lang->kanbancard->colorList['#b10b0b'] = 'Blocking'; +$lang->kanbancard->colorList['#cfa227'] = 'Warning'; +$lang->kanbancard->colorList['#2a5f29'] = 'Urgent'; $lang->kanbancard->error = new stdClass(); $lang->kanbancard->error->recordMinus = 'Estimate cannot be negative!'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index a1fd1db494..90ff0ad423 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -298,9 +298,9 @@ $lang->kanbancard->priList[3] = 3; $lang->kanbancard->priList[4] = 4; $lang->kanbancard->colorList['#fff'] = '默认'; -$lang->kanbancard->colorList['#d2323d'] = '阻塞'; -$lang->kanbancard->colorList['#f7b501'] = '警告'; -$lang->kanbancard->colorList['#278427'] = '加急'; +$lang->kanbancard->colorList['#b10b0b'] = '阻塞'; +$lang->kanbancard->colorList['#cfa227'] = '警告'; +$lang->kanbancard->colorList['#2a5f29'] = '加急'; $lang->kanbancard->error = new stdClass(); $lang->kanbancard->error->recordMinus = '预计不能为负数!'; diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index 8079c23fa6..9dbf290225 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -28,9 +28,9 @@ #archivedCards .info > .users > span:after {right: -4px;} #archivedCards .info > .users .avatar {display: inline-block; position: relative; border-radius: 50%; top: -5px; margin: 5px; right: -7px; margin-left: -4px;} #archivedCards .cardName {word-wrap: break-word;} -#archivedCards .card-item .red {background-color: #d2323d;} -#archivedCards .card-item .yellow {background-color: #f7b501;} -#archivedCards .card-item .green {background-color: #278427;} +#archivedCards .card-item .red {background-color: #b10b0b;} +#archivedCards .card-item .yellow {background-color: #cfa227;} +#archivedCards .card-item .green {background-color: #2a5f29;} #archivedCards .card-item .has-color .cardName, #archivedCards .card-item .has-color .actions .icon-more-v, #archivedCards .card-item .has-color .info > .label-pri, @@ -49,9 +49,9 @@
color == '#d2323d') $color = 'has-color red'; - if($card->color == '#f7b501') $color = 'has-color yellow'; - if($card->color == '#278427') $color = 'has-color green'; + if($card->color == '#b10b0b') $color = 'has-color red'; + if($card->color == '#cfa227') $color = 'has-color yellow'; + if($card->color == '#2a5f29') $color = 'has-color green'; ?>
createLink('kanban', 'viewCard', "cardID=$card->id", '', true), $card->name, '', "class='cardName iframe' data-toggle='modal' data-width='80%' title='$card->name'");?>