Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/241_dyl_70018' into 'master'

Browse Source 
* task #70018, change bug confirmed color.

See merge request easycorp/zentaopms!5467
This commit is contained in:
王怡栋
2022-09-22 06:09:26 +00:00
parent e2a3dd7344 c7c4ec7429
commit d4ed48e790
10 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/config.php
+1 -1
View File
@@ -188,7 +188,7 @@ $config->bug->datatable->fieldList['pri']['name'] = $lang->bug->pri;
$config->bug->datatable->fieldList['confirmed']['title'] = 'confirmedAB';
$config->bug->datatable->fieldList['confirmed']['fixed'] = 'left';
$config->bug->datatable->fieldList['confirmed']['width'] = '50';
$config->bug->datatable->fieldList['confirmed']['width'] = '100';
$config->bug->datatable->fieldList['confirmed']['required'] = 'no';
$config->bug->datatable->fieldList['title']['title'] = 'title';
module/bug/css/browse.css
-2
View File
@@ -2,8 +2,6 @@
.closed, .closed a {color: gray; text-decoration:line-through;}
.resolved, .resolved a {color: #8EC21F; text-decoration: none;}
.tree .closed, .tree .closed a {color: #003366; text-decoration: none;}
.confirm0 {color: gray;}
.confirm1 {color: green;}
td.delayed {color: #fff; background: #e84e0f !important;}
#bugForm .setting {height: 25px;}
module/bug/css/m.browse.css
+2 -2
View File
@@ -1,2 +1,2 @@
.confirm0 {color:gray; font-size:9px}
.confirm1 {color:green; font-size:9px}
.confirm0 {font-size:9px}
.confirm1 {font-size:9px}
module/bug/lang/en.php
+2 -2
View File
@@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = 'Resolved';
$lang->bug->statusList['closed'] = 'Closed';
$lang->bug->confirmedList[''] = '';
$lang->bug->confirmedList[1] = 'Yes';
$lang->bug->confirmedList[0] = 'No';
$lang->bug->confirmedList[1] = 'confirmed';
$lang->bug->confirmedList[0] = 'unconfirmed';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = 'As Designed';
module/bug/lang/fr.php
+2 -2
View File
@@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = 'Résolu';
$lang->bug->statusList['closed'] = 'Fermé';
$lang->bug->confirmedList[''] = '';
$lang->bug->confirmedList[1] = 'Oui';
$lang->bug->confirmedList[0] = 'Non';
$lang->bug->confirmedList[1] = 'confirmé';
$lang->bug->confirmedList[0] = 'non confirmé';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = 'Du Design';
module/bug/lang/vi.php
+2 -2
View File
@@ -265,8 +265,8 @@ $lang->bug->statusList['active'] = 'Kích hoạt';
$lang->bug->statusList['resolved'] = 'Đã giải quyết';
$lang->bug->statusList['closed'] = 'Đã đóng';
$lang->bug->confirmedList[1] = 'Có';
$lang->bug->confirmedList[0] = 'Không';
$lang->bug->confirmedList[1] = 'đã xác nhận';
$lang->bug->confirmedList[0] = 'chưa được xác nhận';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = 'Như thiết kế';
module/bug/lang/zh-cn.php
+2 -2
View File
@@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = '已解决';
$lang->bug->statusList['closed'] = '已关闭';
$lang->bug->confirmedList[''] = '';
$lang->bug->confirmedList[1] = '是';
$lang->bug->confirmedList[0] = '否';
$lang->bug->confirmedList[1] = '已确认';
$lang->bug->confirmedList[0] = '未确认';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = '设计如此';
module/bug/lang/zh-tw.php
+2 -2
View File
@@ -283,8 +283,8 @@ $lang->bug->statusList['resolved'] = '已解決';
$lang->bug->statusList['closed'] = '已關閉';
$lang->bug->confirmedList[''] = '';
$lang->bug->confirmedList[1] = '是';
$lang->bug->confirmedList[0] = '否';
$lang->bug->confirmedList[1] = '已確認';
$lang->bug->confirmedList[0] = '未確認';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = '設計如此';
module/my/css/bug.css
+2 -3
View File
@@ -1,4 +1,3 @@
td.delayed {color: #fff; background: #e84e0f !important;}
.confirmed {color: #008000;}
.unconfirmed {color: #808080;}
.c-confirm {width:50px;}
.c-confirm {width:60px;}
www/theme/default/style.css
+4
View File
@@ -71,6 +71,10 @@ a.showMoreImage:hover {opacity: 1;}
.c-object {width: 250px;}
.c-case-step {width: 300px;}
.c-actions-8 {width: 240px;}
.confirmed, .confirm1 {color: #0DBB7D;}
.unconfirmed, .confirm0 {color: gray;}
#userNav>li.open>a:before, #userNav>li>a:hover:before {position: absolute; bottom: 0px; left: calc(50% - 10px); width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;}
#userNav .dropdown-menu {z-index: 2000;}
#userNav .dropdown-menu:hover + .dropdown-toggle:before {position: absolute; bottom: 0px; left: calc(50% - 10px); width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;}