Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2016-05-05 16:31:44 +08:00
3 changed files with 15 additions and 3 deletions
+1 -1
View File
@@ -27,7 +27,7 @@
</nav>
</div>
<table class='table'>
<table class='table with-border'>
<thead>
<tr class='colhead'>
<?php $vars = "productID={$productID}&type=$type&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+3 -1
View File
@@ -40,7 +40,7 @@
</ul>
</div>
<table class='table table-fixed'>
<table class='table table-fixed with-border'>
<thead>
<tr>
<?php $vars = "projectID={$projectID}&type=$type&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
@@ -52,6 +52,7 @@
<th><?php echo $lang->action->objectName;?></th>
</tr>
</thead>
<?php if(count($actions)): ?>
<tbody>
<?php foreach($actions as $action):?>
<?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
@@ -65,6 +66,7 @@
</tr>
<?php endforeach;?>
</tbody>
<?php endif; ?>
<tfoot><tr><td colspan='6'><?php $pager->show();?></td></tr></tfoot>
</table>
<script>$('#<?php echo $type;?>').addClass('active')</script>
+11 -1
View File
@@ -529,7 +529,17 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
/* table in outer */
.outer .table {margin-bottom: 0; border: 1px solid #ddd;}
@-moz-document url-prefix(){.outer .table, .outer .table.table-form.with-border {box-shadow: 1px 1px 0 #ddd, -1px 0 0 #ddd; border-left: none; border-right: none; border-bottom: none} .panel .table, #querybox .table, .outer > .container .table-form, .outer > .container .table-data, .outer .main-side .table, .outer .table.table-form {box-shadow: none}}
@-moz-document url-prefix()
{
.outer .table.with-border thead > tr > th:first-child,
.outer .table.with-border tfoot > tr > td:first-child,
.outer .table.with-border tbody > tr > td:first-child {border-left: 1px solid #ddd}
.outer .table.with-border thead > tr > th:last-child,
.outer .table.with-border tfoot > tr > td:last-child,
.outer .table.with-border tbody > tr > td:last-child {border-right: 1px solid #ddd}
.outer .table.with-border > *:first-child > tr:first-child > th {border-top: 1px solid #ddd;}
.outer .table.with-border > *:last-child > tr:last-child > td {border-bottom: 1px solid #ddd;}
}
.outer .table thead tr th {text-align: center;}
.outer .table thead tr th.text-left {text-align: left;}
.outer .table tbody td {vertical-align: middle;}