From 17ef65813e1ef31a2eeab3466d68288796f8d403 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 20 Oct 2022 10:37:07 +0800 Subject: [PATCH 1/3] * Modify Kanban Settings page style issues. --- module/execution/view/kanban.html.php | 2 +- www/theme/default/style.css | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php index ef11cd5ea9..f8acbc9740 100644 --- a/module/execution/view/kanban.html.php +++ b/module/execution/view/kanban.html.php @@ -157,7 +157,7 @@ js::set('priv', " . $lang->searchAB, '', "class='btn btn-link querybox-toggle'"); echo html::a('javascript:fullScreen()', " " . $lang->kanban->fullScreen, '', "class='btn btn-link'"); if(common::hasPriv('execution', 'setKanban')) echo html::a(helper::createLink('execution', 'setKanban', "executionID=$execution->id", '', true), ' ' . $lang->settings, '', "class='iframe btn btn-link text-left' data-width='$width'"); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 903622c2d1..9492a9d19b 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -122,8 +122,10 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p .setting-input {width: 64px; height: 20px; margin: 0 4px; text-align: center;} .setting-input.disabled,.setting-input[disabled="disabled"] {color: #C4C4C4;} .width-radio-row {display: flex;} -#dataform .width-radio-row.required:after {top: 1px; left: 360px;} +#dataform .width-radio-row.required:after {top: 1px; left: 215px;} +#dataform .width-radio-row.mt10.required:after {top: 1px; left: 355px;} .mt10 {margin-top: 10px;} +#dataform tr > th {vertical-align: top;} #programTableList > tr:hover {background: #E6F0FFCC;} From f107a95ba241c764700413f601e5c04fea3f9ef3 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 20 Oct 2022 10:55:31 +0800 Subject: [PATCH 2/3] * Fix bug #28706. --- module/execution/model.php | 2 +- module/project/css/execution.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/module/execution/model.php b/module/execution/model.php index 53d34b207f..40f754c853 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4630,7 +4630,7 @@ class executionModel extends model } else { - echo $execution->name; + echo "" . $execution->name . ''; if(!helper::isZeroDate($execution->end)) { if($execution->status != 'closed') diff --git a/module/project/css/execution.css b/module/project/css/execution.css index 0dc1148810..2f4195eec6 100644 --- a/module/project/css/execution.css +++ b/module/project/css/execution.css @@ -15,3 +15,4 @@ th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;} td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;} td.c-name > .project-type-label {flex: 0 0 36px; padding-right: 2px;} .c-name > a, .table-children .text-left > a { padding-left: 5px; text-overflow: clip;} +.c-name > span.text-ellipsis {padding-left: 5px;} From 6ba9f6a1959f59668a215a41f0656963239f4026 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 20 Oct 2022 11:02:11 +0800 Subject: [PATCH 3/3] * Fix bug #28706. --- module/project/css/execution.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/project/css/execution.css b/module/project/css/execution.css index 2f4195eec6..71939a8e6b 100644 --- a/module/project/css/execution.css +++ b/module/project/css/execution.css @@ -14,5 +14,5 @@ th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;} .table-statistic {padding-left: 10px;} td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;} td.c-name > .project-type-label {flex: 0 0 36px; padding-right: 2px;} -.c-name > a, .table-children .text-left > a { padding-left: 5px; text-overflow: clip;} -.c-name > span.text-ellipsis {padding-left: 5px;} +.c-name > a, .table-children .text-left > a, .c-name > span.text-ellipsis { padding-left: 5px; text-overflow: clip;} +span.table-nest-icon.table-nest-toggle {min-width: 22px; max-width: 22px;}