Merge branch 'master' into 'master_liuhong_63787'

# Conflicts:
#   module/program/css/browse.css
#   module/project/css/browse.css
This commit is contained in:
王怡栋
2022-08-11 01:22:50 +00:00
99 changed files with 1032 additions and 424 deletions

View File

@@ -14,6 +14,7 @@ tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;}
.has-suffix > a {max-width: calc(100% - 100px); padding-right: 5px; color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
div.checkbox-primary + span.table-nest-icon {margin-left:0px !important;}
div.checkbox-primary + span.table-nest-icon {margin-left: 0px !important;}
#checkAll + label.hover:after {border-width: 0px;}
.c-budget {width:100px; text-align: right; padding-right:16px !important;}
.c-status {width: 65px !important;}