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

This commit is contained in:
wangyidong
2016-03-08 11:34:12 +08:00

View File

@@ -531,7 +531,8 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
.outer .table.table-data.table-borderless tbody > tr:last-child td, .outer .table.table-form tbody > tr:last-child td {border: none}
.outer .table tfoot td {border-top: 1px solid #ddd}
.outer .table tfoot .form-control {padding: 1px 8px; height: 30px}
.outer .table tfoot .btn {padding: 2px 6px; font-size: 13px; line-height: 20px;}
.outer .table tfoot .btn {padding: 2px 6px; font-size: 13px; line-height: 20px; }
.outer .table tfoot .btn:not(.btn-primary) {background-color: #FAFAFA; color: #036}
.outer .table tfoot .btn > i {display: inline-block; margin-right: 1px; opacity: 0.8}
.outer .table tfoot .datepicker-wrapper:before {top: 5px}
.outer .table tfoot .form-control.form-date {width: 110px}
@@ -685,8 +686,13 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#searchbox {display: none}
}
.fixedTfootAction{position: fixed; bottom: 40px; background: #fff;}
.fixedTfootAction{position: fixed; bottom: 40px; background: #fff; border-top: 1px solid #bbb}
.fixedTheadOfList{position: fixed; top: 0px; z-index:10;}
#passwordStrength{display:none;}
.warning{color:red;}
.nofixed td{white-space:normal;}
#passwordStrength{display:none;}
.datatable.head-fixed > .datatable-head .table > thead > tr > th {background-color: #fff; border-bottom-color: #bbb}