From 768d21df135b84f622479e2ab69e7aae9f9be589 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 29 May 2024 15:42:02 +0800 Subject: [PATCH] * [bug#50369,done,0.2h] adjust the height of the description box. --- module/execution/css/view.ui.css | 2 ++ module/execution/ui/view.html.php | 3 ++- module/product/css/view.ui.css | 2 ++ module/product/ui/view.html.php | 3 ++- module/project/css/view.ui.css | 2 ++ module/project/ui/view.html.php | 7 ++++++- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/module/execution/css/view.ui.css b/module/execution/css/view.ui.css index 53c33eac24..db00d686cd 100644 --- a/module/execution/css/view.ui.css +++ b/module/execution/css/view.ui.css @@ -8,3 +8,5 @@ .actions-menu {bottom: 12px;} #mainContent {margin-bottom: 60px;} + +#mainContent .desc-box {max-height: 6rem;} diff --git a/module/execution/ui/view.html.php b/module/execution/ui/view.html.php index e4c867a414..af6d89b6a9 100644 --- a/module/execution/ui/view.html.php +++ b/module/execution/ui/view.html.php @@ -298,7 +298,8 @@ div ), div ( - set::className('detail-content mt-4'), + set::className('detail-content mt-4 overflow-hidden desc-box'), + set::title(strip_tags($execution->desc)), html($execution->desc) ) ) diff --git a/module/product/css/view.ui.css b/module/product/css/view.ui.css index 5df387b8a1..1dec845215 100644 --- a/module/product/css/view.ui.css +++ b/module/product/css/view.ui.css @@ -10,3 +10,5 @@ .member-list > .center-y {width: 12.5%} .memberBox .panel-heading, .otherInfoBox .panel-heading{background-color: var(--color-gray-100); color: var(--color-gray-900)} #mainContainer{margin-bottom: 60px;} + +#mainContent .desc-box {max-height: 6rem;} diff --git a/module/product/ui/view.html.php b/module/product/ui/view.html.php index 32cac601ba..a73aa9bdf7 100644 --- a/module/product/ui/view.html.php +++ b/module/product/ui/view.html.php @@ -195,7 +195,8 @@ div ), div ( - set::className('detail-content mt-4'), + set::className('detail-content mt-4 overflow-hidden desc-box'), + set::title(strip_tags($product->desc)), html($product->desc) ) ) diff --git a/module/project/css/view.ui.css b/module/project/css/view.ui.css index 706f87bc48..869d3db65e 100644 --- a/module/project/css/view.ui.css +++ b/module/project/css/view.ui.css @@ -13,3 +13,5 @@ .member-list > .center-y {width: 12.5%} .maxh-80{max-height: 20rem;} + +#mainContent .desc-box {max-height: 6rem;} diff --git a/module/project/ui/view.html.php b/module/project/ui/view.html.php index e3e1fd060f..616b764061 100644 --- a/module/project/ui/view.html.php +++ b/module/project/ui/view.html.php @@ -274,7 +274,12 @@ row ) ), div(setClass('flex mt-4 program'), div(setClass('clip programBox'), $programDom)), - div(set::className('detail-content mt-4'), html($project->desc)) + div + ( + set::className('detail-content mt-4 overflow-hidden desc-box'), + set::title(strip_tags($project->desc)), + html($project->desc) + ) ) ), div