From db76e10f07852b0ec27610dad281fca709c27e38 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 28 Jun 2023 10:27:26 +0800 Subject: [PATCH] * Adjust style of the link product box. --- module/execution/css/create.ui.css | 2 ++ module/execution/ui/create.html.php | 25 +++++++++---------------- module/project/css/create.ui.css | 2 ++ module/project/ui/create.html.php | 22 +++++++--------------- 4 files changed, 20 insertions(+), 31 deletions(-) diff --git a/module/execution/css/create.ui.css b/module/execution/css/create.ui.css index 1c44df97c2..4638e13b5a 100644 --- a/module/execution/css/create.ui.css +++ b/module/execution/css/create.ui.css @@ -1,3 +1,5 @@ +.createPanel {max-width: 1200px !important;} .methodTip {width: 200px !important;} #lifeTimeTips {padding-left: 1rem; align-items: center;} .team-hr {margin-top: 0 !important;} +#productsBox .line-btn {width: 48px; margin-right: 32px;} diff --git a/module/execution/ui/create.html.php b/module/execution/ui/create.html.php index d9dae499d2..8988a05caa 100644 --- a/module/execution/ui/create.html.php +++ b/module/execution/ui/create.html.php @@ -162,14 +162,10 @@ if(isset($project->hasProduct) and !empty($project->hasProduct) and $products) set::items($plans), set::value($planID) ) - ) - ), - $isStage && $project->stageBy == 'project' ? null : formGroup - ( - set::width('1/6'), - div + ), + $isStage && $project->stageBy == 'project' ? null : div ( - setClass('pl-2 flex self-center'), + setClass('pl-2 flex self-center line-btn'), btn ( setClass('btn btn-link addLine'), @@ -184,7 +180,7 @@ if(isset($project->hasProduct) and !empty($project->hasProduct) and $products) on::click('removeLine'), ), ) - ) + ), ); $i ++; @@ -259,14 +255,10 @@ else set::items($productPlan), set::multiple(true) ) - ) - ), - $isStage && $project->stageBy == 'product' ? null : formGroup - ( - set::width('1/6'), - div + ), + $isStage && $project->stageBy == 'product' ? null : div ( - setClass('pl-2 flex self-center'), + setClass('pl-2 flex self-center line-btn'), btn ( setClass('btn btn-link addLine'), @@ -281,12 +273,13 @@ else on::click('removeLine'), ), ), - ) + ), ); } formPanel ( + set::class('createPanel'), to::heading(div ( setClass('panel-title text-lg'), diff --git a/module/project/css/create.ui.css b/module/project/css/create.ui.css index 7445092d2f..47079ba4b2 100644 --- a/module/project/css/create.ui.css +++ b/module/project/css/create.ui.css @@ -8,3 +8,5 @@ #copyProjects button.primary-outline:after {position: absolute; content: '\e92f'; font-family: ZentaoIcon; font-size: 20px; right: 25px;} .has-info {--tw-ring-color: var(--color-warning-500) !important;} .programTip {width: 200px !important;} +.productBox .line-btn {width: 48px; margin-right: 32px;} +.productBox div[id^=plan] {flex: 1 1;} diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php index 89751309cb..b2730a301a 100644 --- a/module/project/ui/create.html.php +++ b/module/project/ui/create.html.php @@ -94,14 +94,10 @@ if(!empty($products)) set::items($plans), set::value($product->plans) ) - ) - ), - formGroup - ( - set::width('1/6'), + ), div ( - setClass('pl-2 flex self-center'), + setClass('pl-2 flex self-center line-btn'), btn ( setClass('btn btn-link addLine'), @@ -116,7 +112,7 @@ if(!empty($products)) $i == 0 ? set::disabled(true) : null ), ) - ) + ), ); $i ++; @@ -371,7 +367,7 @@ formPanel ), formGroup ( - set::width('1/2'), + set::width('1/4'), setClass('hidden'), inputGroup ( @@ -396,14 +392,10 @@ formPanel set::items(null), set::multiple(false) ) - ) - ), - formGroup - ( - set::width('1/6'), + ), div ( - setClass('pl-2 flex self-center'), + setClass('pl-2 flex self-center line-btn'), btn ( setClass('btn btn-link addLine'), @@ -418,7 +410,7 @@ formPanel $i == 0 ? set::disabled(true) : null ), ) - ) + ), ), formGroup (