Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/mater_zhouxudong_56368' into 'master'

Browse Source 
* Finish task #56368.

See merge request easycorp/zentaopms!3855
This commit is contained in:
王怡栋
2022-06-10 05:06:30 +00:00
parent 4a125c68ab 8f8eaaa837
commit e87eb29642
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/kanban/css/view.css
View File

@@ -15,7 +15,7 @@
.region {border: 0px solid #dcdcdc; background-color: #fff;}
.region + .region {margin-top: 20px;}
.region .region-header {padding: 10px;}
.region .region-header strong {font-size: 14px; color: #999EAB}
.region .region-header strong {font-size: 14px; color: #3C4353; float: left;}
.region .region-header label {color: #999; background: transparent; border: 1px solid #ddd; margin-left: 10px; margin-right: 10px}
.region .region-header .action {float: right}
.region .region-actions {float: right; position: relative; top: -6px; right: -6px;}
@@ -102,6 +102,7 @@
.cardcolor {width:40px; height: 14px; float: left; margin-left: 5px; margin-right: 5px; margin-top: 2px; border-radius: 2px;}
#cardcolormenu {padding:2px 2px; width: 100px;}
.position {margin-top: -6px;}
.kanban-col[data-type=ADD] {display: none;}
.kanban-col[data-type=EMPTY] {display: none;}
.kanban-col {padding-right: 0px !important;}
@@ -136,6 +137,7 @@
.progress-box {width:100%; display: flex; flex-direction: row; margin-top: 10px;}
.progress {flex: auto; margin: 5px auto 5px;}
.progress-number {padding-left: 5px;}
.region .region-header .action {float: left;}
@-moz-document url-prefix(){ .region .kanban-lane-items{scrollbar-width:thin; padding:5px 0px 5px 5px !important;} .region .kanban-card .info .user{right: -6px !important;}}
#archivedCards .table-empty-tip {border-style: hidden;}

2
module/kanban/view/view.html.php
View File

@@ -57,7 +57,7 @@ $canCreateLane = commonModel::hasPriv('kanban', 'createLane');
<div class="region<?php if($canSortRegion) echo ' sort';?>" data-id="<?php echo $region->id;?>">
<div class="region-header dropdown">
<strong><?php echo $region->name;?></strong>
<a class="text-muted"><i class="icon icon-angle-top" data-id="<?php echo $region->id;?>"></i></a>
<button class="btn btn-link action position"><i class="icon icon-angle-top" data-id="<?php echo $region->id;?>"></i></button>
<div class='region-actions'>
<?php if(($canEditRegion || $canCreateLane || $canDeleteRegion) and !(isset($this->config->CRKanban) and $this->config->CRKanban == '0' and $kanban->status == 'closed')):?>
<button class="btn btn-link action" type="button" data-toggle="dropdown"><i class="icon icon-ellipsis-v"></i></button>