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

Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'

Browse Source 
* Optimize style for cards in client.

See merge request easycorp/zentaopms!985
This commit is contained in:
朱金勇
2021-12-17 07:39:30 +00:00
parent 3381dd3ab0 fd3a645a30
commit d8852453dc
5 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/execution/css/x.task.css
View File

@@ -4,8 +4,10 @@ td .task-toggle {pointer-events: auto !important;}
#main {min-width: unset; overflow-y: overlay;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 36px;}
.main-table {margin-bottom: 40px;}
.main-table a {pointer-events: none;}
.main-table > .table, .main-table > .table-footer, .main-table > .table-header, .main-table > .table-responsive {border: none!important; box-shadow: none!important; padding: 0!important;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager {background-color: #fff !important;}
@@ -13,5 +15,7 @@ td .task-toggle {pointer-events: auto !important;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 40px; display: block;}
.linkButton i {font-size: 18px !important;}
.linkButton span {line-height: 36px; display: block;}
::-webkit-scrollbar {width: 10px; height: 10px;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}

14
module/execution/view/task.html.php
View File

@@ -483,10 +483,24 @@ $(function()
}
})
});
<?php if($this->app->getViewType() == 'xhtml'):?>
function handleLinkButtonClick()
{
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
window.open(xxcUrl);
}
$(function()
{
function handleClientReady()
{
if(!window.adjustXXCViewHeight) return;
window.adjustXXCViewHeight(null, true);
}
if(window.xuanReady) handleClientReady();
else $(window).on('xuan-ready', handleClientReady);
});
<?php endif; ?>
</script>
<?php include '../../common/view/footer.html.php';?>