From 3acbdf8ecb3f19a4fbb135cad322bf3f21c18bfc Mon Sep 17 00:00:00 2001 From: sunhao Date: Wed, 27 Dec 2023 19:49:20 +0800 Subject: [PATCH] * Refactor style of labels. --- lib/zin/wg/dynamic/v1.php | 2 +- module/block/ui/productstatisticblock.html.php | 4 ++-- module/block/ui/singlestatisticblock.html.php | 4 ++-- module/execution/ui/view.html.php | 2 +- module/product/ui/view.html.php | 4 ++-- module/project/ui/view.html.php | 2 +- module/testcase/js/browse.ui.js | 2 +- module/testcase/ui/showscript.html.php | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/zin/wg/dynamic/v1.php b/lib/zin/wg/dynamic/v1.php index 6225a61557..fcad6f163c 100644 --- a/lib/zin/wg/dynamic/v1.php +++ b/lib/zin/wg/dynamic/v1.php @@ -47,7 +47,7 @@ class dynamic extends wg $objectID = $dynamic->objectID && strpos(',module,chartgroup,', ",$dynamic->objectType,") !== false && strpos(',created,edited,moved,', "$dynamic->action") !== false ? trim($dynamic->extra, ',') : $dynamic->objectID; $objectLabel[] = $objectID ? span ( - setClass('label light-outline mx-2 font-sm'), + setClass('label gray-300-outline mx-2 font-sm'), $objectID ) : null; diff --git a/module/block/ui/productstatisticblock.html.php b/module/block/ui/productstatisticblock.html.php index 4ba47392b5..f375b65fb3 100644 --- a/module/block/ui/productstatisticblock.html.php +++ b/module/block/ui/productstatisticblock.html.php @@ -233,7 +233,7 @@ statisticBlock ) : $product->newPlan->title, label ( - setClass('lighter-pale rounded-full px-1'), + setClass('gray-pale rounded-full px-1'), zget($lang->productplan->statusList, $product->newPlan->status) ) ) @@ -271,7 +271,7 @@ statisticBlock ) : $product->newRelease->name, label ( - setClass('rounded-full', ($product->newRelease->status == 'normal' ? 'success-pale' : 'lighter-pale')), + setClass('rounded-full', ($product->newRelease->status == 'normal' ? 'success-pale' : 'gray-pale')), zget($lang->release->statusList, $product->newRelease->status) ) ) diff --git a/module/block/ui/singlestatisticblock.html.php b/module/block/ui/singlestatisticblock.html.php index 591cc4aed2..208de7c607 100644 --- a/module/block/ui/singlestatisticblock.html.php +++ b/module/block/ui/singlestatisticblock.html.php @@ -245,7 +245,7 @@ panel ), span ( - setClass('label lighter-pale rounded-full ml-2 px-1'), + setClass('label gray-pale rounded-full ml-2 px-1'), zget($lang->productplan->statusList, $product->newPlan->status) ) ) @@ -289,7 +289,7 @@ panel ), span ( - setClass('label rounded-full ml-2 ' . ($product->newRelease->status == 'normal' ? 'success-pale' : 'lighter-pale')), + setClass('label rounded-full ml-2 ' . ($product->newRelease->status == 'normal' ? 'success-pale' : 'gray-pale')), zget($lang->release->statusList, $product->newRelease->status) ) ) diff --git a/module/execution/ui/view.html.php b/module/execution/ui/view.html.php index d82d67d49c..fe2b926eb7 100644 --- a/module/execution/ui/view.html.php +++ b/module/execution/ui/view.html.php @@ -254,7 +254,7 @@ div ), !empty($config->setCode) && !empty($execution->code) ? label ( - setClass('light-outline mx-2 flex-none'), + setClass('gray-300-outline mx-2 flex-none'), $execution->code ) : null, $execution->deleted ? label diff --git a/module/product/ui/view.html.php b/module/product/ui/view.html.php index b0a9050ab0..b1718b0132 100644 --- a/module/product/ui/view.html.php +++ b/module/product/ui/view.html.php @@ -137,12 +137,12 @@ div ), !$hiddenCode ? label ( - setClass('light-outline ml-2 flex-none'), + setClass('gray-300-outline ml-2 flex-none'), $product->code ) : null, $product->type != 'normal' ? label ( - setClass('light-outline ml-2 text-warning flex-none'), + setClass('gray-300-outline ml-2 text-warning flex-none'), $lang->product->typeList[$product->type] ) : null, $product->deleted ? label diff --git a/module/project/ui/view.html.php b/module/project/ui/view.html.php index 4fe30978e9..e6b123e7f3 100644 --- a/module/project/ui/view.html.php +++ b/module/project/ui/view.html.php @@ -319,7 +319,7 @@ div ), !empty($config->setCode) && !empty($project->code) ? label ( - setClass('label lighter-pale ml-2 flex-none'), + setClass('label gray-pale ml-2 flex-none'), $project->code ) : null, label diff --git a/module/testcase/js/browse.ui.js b/module/testcase/js/browse.ui.js index c8c782aa95..1f92f75b42 100644 --- a/module/testcase/js/browse.ui.js +++ b/module/testcase/js/browse.ui.js @@ -65,7 +65,7 @@ window.onRenderCell = function(result, {row, col}) result.shift(); // 移除带链接的场景名称 result.push({html: data.title}); // 添加不带链接的场景名称 if(data.grade == 1 && module) result.unshift({html: '' + module + ''}); // 顶级场景添加模块标签 - result.unshift({html: '' + scene + ''}); // 添加场景标签 + result.unshift({html: '' + scene + ''}); // 添加场景标签 if(!this.options.customData.isOnlyScene && data.hasCase == false) result.push({html: '(' + noCase + ')'}); // 添加暂无用例标签 } else // 用例 diff --git a/module/testcase/ui/showscript.html.php b/module/testcase/ui/showscript.html.php index 631af20e4b..760a9a85ea 100644 --- a/module/testcase/ui/showscript.html.php +++ b/module/testcase/ui/showscript.html.php @@ -25,7 +25,7 @@ foreach($lines as $key => $line) ( h::td ( - setClass('align-top text-right border-r lighter-pale px-1 py-0'), + setClass('align-top text-right border-r gray-pale px-1 py-0'), ++$key ), h::td