Merge branch 'fixbugs_zhouxin' into 'master'
* Adjust code. See merge request easycorp/zentaopms!3186
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
.project-type-label.label-outline {width: 50px; min-width: 50px;}
|
||||
.project-type-label.label {overflow: unset !important; text-overflow: unset !important; white-space: unset !important;}
|
||||
[lang^='en'] .project-name > .label-warning {width: 55px !important;}
|
||||
#projectTableList > tr > td.c-name.text-left > div > a {color: #0c60e1;}
|
||||
|
||||
@@ -1708,7 +1708,7 @@ class projectModel extends model
|
||||
if(isset($project->delay)) $suffix = "<span class='label label-danger label-badge'>{$this->lang->project->statusList['delay']}</span>";
|
||||
if(!empty($suffix) || !empty($prefix)) echo '<div class="project-name' . (empty($prefix) ? '' : ' has-prefix') . (empty($suffix) ? '' : ' has-suffix') . '">';
|
||||
if(!empty($prefix)) echo $prefix;
|
||||
echo html::a($projectLink, $project->name, '', "class='text-ellipsis'");
|
||||
echo html::a($projectLink, $project->name, '', "class='text-ellipsis text-primary'");
|
||||
if(!empty($suffix)) echo $suffix;
|
||||
if(!empty($suffix) || !empty($prefix)) echo '</div>';
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user