Merge branch 'sprint/master_zhouxudong_59522' into 'master'
* Finish task #59518 #59522. See merge request easycorp/zentaopms!4350
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
html[lang='en'] #moduleIdBox .input-group-addon {padding: 5px 23px;}
|
||||
html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;}
|
||||
html[lang='zh-cn'] #keywordsAddonLabel, .task {width: 77px;}
|
||||
html[lang='zh-tw'] #keywordsAddonLabel, .task {width: 77px;}
|
||||
html[lang='fr'] #keywordsAddonLabel, .task {width: 61px;}
|
||||
html[lang='de'] #keywordsAddonLabel, .task {width: 73px;}
|
||||
|
||||
.ke-toolbar .ke-outline[data-name='savetemplate'] {display: block;}
|
||||
.ke-outline .ke-icon-savetemplate {background-image: url(theme/default/images/kindeditor/save.gif); background-position: center; width: 56px; height: 20px;}
|
||||
|
||||
@@ -312,7 +312,7 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
|
||||
<td>
|
||||
<div class='input-group'>
|
||||
<?php if($showStory):?>
|
||||
<span class='input-group-addon'><?php echo $lang->bug->task?></span>
|
||||
<span class='input-group-addon task'><?php echo $lang->bug->task?></span>
|
||||
<?php endif;?>
|
||||
<?php echo html::select('task', '', $taskID, "class='form-control chosen'") . html::hidden('oldTaskID', $taskID);?>
|
||||
</div>
|
||||
|
||||
@@ -20,7 +20,7 @@ $status = $this->session->testTaskVersionStatus;
|
||||
?>
|
||||
<?php js::set('status', strtolower($status));?>
|
||||
<style>
|
||||
#action-divider{display: inline-block; line-height: 0px; border-right: 2px solid #ddd}
|
||||
#action-divider{display: inline-block; line-height: 0px;}
|
||||
</style>
|
||||
<div id="mainMenu" class='clearfix'>
|
||||
<div class="btn-toolbar pull-left">
|
||||
|
||||
Reference in New Issue
Block a user