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

This commit is contained in:
wangyidong
2018-05-24 14:52:13 +08:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
.block-todoes .todoes-input .form-control::-moz-placeholder {font-size: 12px;line-height: 20px;color: #a4a8b6;}
.block-todoes .todoes-input .form-control:-ms-input-placeholder {font-size: 12px;line-height: 20px;color: #a4a8b6;}
.block-todoes .todoes-input .form-control::placeholder {font-size: 12px;line-height: 20px;color: #a4a8b6;}
.block-todoes .todoes {padding-left: 0;margin: 0 -10px; max-height: 350px; overflow: auto;}
.block-todoes .todoes {padding: 0 10px; margin: 0 -20px; max-height: 350px; overflow: auto;}
.block-todoes .todoes > li {position: relative;padding: 5px 10px 5px 35px;list-style: none;}
.block-todoes .todoes > li:hover {background-color: #e9f2fb;}
.block-todoes .todo-title {display: block;padding: 5px;}
+2 -2
View File
@@ -314,10 +314,10 @@ tbody tr td:first-child input{display:none;}
</tr>
<?php if($this->config->global->flow != 'onlyTest'):?>
<tr>
<th><?php echo $lang->build->desc;?></th>
<th style="vertical-align:top"><?php echo $lang->build->desc;?></th>
<td>
<?php if($build->desc):?>
<div class='article-content'><?php echo $build->desc;?></div>
<?php echo $build->desc;?>
<?php else:?>
<?php echo $lang->build->noData;?>
<?php endif;?>
File diff suppressed because one or more lines are too long